Merge branch 'master' into cavitytime

.gitattributes

@@ -1,3 +1,6 @@
-## Merger hooks, run tools/hooks/install.bat or install.sh to set up
+## Merge hooks, run tools/hooks/install.bat or install.sh to set up
 *.dmm text eol=lf merge=dmm
 *.dmi binary merge=dmi
+## TGUI bundle merge drivers
+*.bundle.* binary merge=tgui-merge-bundle
+*.chunk.* binary merge=tgui-merge-bundle

.github/CONTRIBUTING.md

@@ -146,6 +146,28 @@ The previous code made compliant:
     code
 ```
 
+### Do not compare boolean values to TRUE or FALSE
+
+Do not compare boolean values to TRUE or FALSE. For TRUE you should just check if there's a value in that address. For FALSE you should use the ! operator. An exception is made to this when working with JS or other external languages. If a function/variable can contain more values beyond null/0 or TRUE, use numbers and defines instead of true/false comparisons.
+
+```dm
+// Bad
+var/thing = pick(list(TRUE, FALSE))
+if(thing == TRUE)
+	return "bleh"
+var/other_thing = pick(list(TRUE, FALSE))
+if(other_thing == FALSE)
+	return "meh"
+
+// Good
+var/thing = pick(list(TRUE, FALSE))
+if(thing)
+	return "bleh"
+var/other_thing = pick(list(TRUE, FALSE))
+if(!other_thing)
+	return "meh"
+```
+
 ### User Interfaces
 
 All new user interfaces in the game must be created using the TGUI framework. Documentation can be found inside the [`tgui/docs`](../tgui/docs) folder, and the [`README.md`](../tgui/README.md) file. This is to ensure all ingame UIs are snappy and respond well. An exception is made for user interfaces which are purely for OOC actions (Such as character creation, or anything admin related)
@@ -154,6 +176,19 @@ All new user interfaces in the game must be created using the TGUI framework. Do
 
 The use of the `:` operator to override type safety checks is not allowed. You must cast the variable to the proper type.
 
+### Do not access return value vars directly from functions
+
+The use of the pointer operator, `.`, should not be used to access the return values of functions directly. This can cause unintended behavior and is difficult to read.
+
+```dm
+//Bad
+var/our_x = get_turf(thing).x
+
+//Good
+var/turf/our_turf = get_turf(thing)
+var/our_x = our_turf.x
+```
+
 ### Type paths must begin with a /
 
 eg: `/datum/thing`, not `datum/thing`
@@ -354,7 +389,7 @@ This is clearer and enhances readability of your code! Get used to doing it!
 
 ### Player Output
 
-Due to the use of "Goonchat", Paradise requires a special syntax for outputting text messages to players. Instead of `mob << "message"`, you must use `to_chat(mob, "message")`. Failure to do so will lead to your code not working.
+Due to the use of "TGchat", Paradise requires a special syntax for outputting text messages to players. Instead of `mob << "message"`, you must use `to_chat(mob, "message")`. Failure to do so will lead to your code not working.
 
 ### Use early returns
 
@@ -435,7 +470,7 @@ Look for code examples on how to properly use it.
 
 #### Bitflags
 
-* We prefer using bitshift operators instead of directly typing out the value. I.E:
+* Bitshift operators are mandatory, opposed to directly typing out the value. I.E:
 
 ```dm
     #define MACRO_ONE (1<<0)
@@ -443,7 +478,7 @@ Look for code examples on how to properly use it.
     #define MACRO_THREE (1<<2)
 ```
 
-Is preferable to:
+Is accepted, whereas the following is not:
 
 ```dm
     #define MACRO_ONE 1
@@ -753,7 +788,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 `Headcoders` are the overarching "administrators" of the repository. People included in this role are:
 
 * [farie82](https://github.com/farie82)
-* [Charliminator](https://github.com/hal9000PR)
+* [S34N](https://github.com/S34NW)
 * [SteelSlayer](https://github.com/SteelSlayer)
 
 ---
@@ -762,19 +797,21 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 
 
 * [AffectedArc07](https://github.com/AffectedArc07)
+* [Charliminator](https://github.com/hal9000PR)
+* [Contrabang](https://github.com/Contrabang)
 * [lewcc](https://github.com/lewcc)
-* [S34N](https://github.com/S34NW)
 
 ---
 
 `Review Team` members are people who are denoted as having reviews which can affect mergeability status. People included in this role are:
 
-* [lewcc](https://github.com/lewcc)
-* [S34N](https://github.com/S34NW)
-* [Sirryan2002](https://github.com/Sirryan2002)
-* [Contrabang](https://github.com/Contrabang)
 * [Burzah](https://github.com/Burzah)
+* [Charliminator](https://github.com/hal9000PR)
+* [Contrabang](https://github.com/Contrabang)
 * [DGamerL](https://github.com/DGamerL)
+* [Henri215](https://github.com/Henri215)
+* [lewcc](https://github.com/lewcc)
+* [Sirryan2002](https://github.com/Sirryan2002)
 * [Warriorstar](https://github.com/warriorstar-orion)
 
 ---

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
     - master
+  merge_group:
 
 jobs:
   run_linters:
@@ -13,37 +14,47 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+
       - name: Setup Cache
         uses: actions/cache@v4
         with:
           path: $HOME/SpacemanDMM
           key: ${{ runner.os }}-spacemandmm
+
       - name: Install Tools
         run: |
           bash tools/ci/install_build_deps.sh
           bash tools/ci/install_dreamchecker.sh
+
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           cache: 'pip'
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ./tgui/yarn.lock
+
       - run: pip install -r tools/requirements.txt
       - name: Run Linters
         run: |
           tools/ci/check_json.sh
-          tools/ci/build_tgui.sh
+          tgui/bin/tgui --ci
           python tools/ci/check_grep2.py
           python tools/ci/check_line_endings.py
           python tools/ci/check_file_names.py
           python tools/ci/unticked_files.py ${GITHUB_WORKSPACE}
           python tools/ci/illegal_dme_files.py ${GITHUB_WORKSPACE}
+          python tools/ci/define_sanity.py
           python -m tools.ci.check_icon_conflicts
+          python -m tools.ci.check_icon_dupenames
           python -m tools.maplint.source --github
-          ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
-      - name: Annotate Lints
-        uses: yogstation13/DreamAnnotate@v2
-        if: always()
-        with:
-          outputFile: output-annotations.txt
+
+      - name: Run DreamChecker
+        shell: bash
+        run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
 
   odlint:
     name: Lint with OpenDream

.github/workflows/label_stale.yml

@@ -0,0 +1,24 @@
+name: Label and close stale PRs and Issues
+
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Runs at midnight UTC every day
+
+jobs:
+  stale-prs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Seek and destroy stale PRs and Issues
+        uses: actions/stale@v4
+        with:
+          stale-pr-message: 'This pull request seems to be stale as there have been no changes in 14 days, please make changes within 7 days or the PR will be closed. If you believe this is a mistake, please inform a development team member on Discord.'
+          close-pr-message: 'This pull request has not received any updates since being marked stale, and as such is now being automatically closed. Please feel free to re-open this pull request or open a new one once you have new updates.'
+          stale-issue-message: 'This issue either requires verification or is unreproducible, but has had no updates for 60 days. Please provide an update within 14 days or this issue will be closed. If you believe this is a mistake, please contact an issue manager on Discord.'
+          close-issue-message: 'This issue was marked as stale, yet no changes have been observed in the specified time. The issue has been closed.'
+          days-before-stale: 14
+          days-before-issue-stale: 60
+          days-before-close: 7
+          days-before-issue-close: 14
+          exempt-issue-labels: '"Stale Exempt"'
+          exempt-pr-labels: '"Stale Exempt", "-Status: Awaiting approval", "-Status: Awaiting Merge", "-Status: Awaiting type assignment"'
+          only-issue-labels: '"Need Verification", "Cannot Reproduce", "Not A Bug", "(99% Sure) Not A Bug"'

.github/workflows/merge_upstream_master.yml

@@ -0,0 +1,129 @@
+name: Merge Upstream Master
+on:
+  issue_comment:
+    types: created
+
+jobs:
+  merge-upstream:
+    if: |
+      github.event.issue.pull_request &&
+      (github.event.comment.body == '!merge_upstream') &&
+      ((github.event.sender.id == github.event.issue.user.id) ||
+      (github.event.comment.author_association == 'COLLABORATOR') ||
+      (github.event.comment.author_association == 'MEMBER') ||
+      (github.event.comment.author_association == 'OWNER'))
+
+    runs-on: ubuntu-latest
+    steps:
+      - id: create_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
+
+      - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"
+
+      - name: Like the comment
+        run: |
+          gh api \
+            --method POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            /repos/ParadiseSS13/Paradise/issues/comments/${{ github.event.comment.id }}/reactions \
+            -f content='+1'
+
+      - name: PR Data
+        run: |
+          pr_json=$(curl -L -s --fail-with-body -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }})
+          if [ `jq -r '.maintainer_can_modify' <<<$pr_json` == "false" ] ; then
+            gh pr comment ${{ github.event.issue.html_url }} --body 'GitHub Actions can not push to the repository without "Allow edits and access to secrets by maintainers" checked.'
+            exit 0
+          fi
+          echo "PR_REPO=`jq -r '.head.repo.full_name' <<<$pr_json`" >> $GITHUB_ENV
+          echo "PR_BRANCH=`jq -r '.head.ref' <<<$pr_json`" >> $GITHUB_ENV
+          echo "PR_HEAD_LABEL=`jq -r '.head.label' <<<$pr_json`" >> $GITHUB_ENV
+
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ env.PR_REPO }}
+          ref: ${{ env.PR_BRANCH }}
+          token: ${{ env.GH_TOKEN }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ./tgui/yarn.lock
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
+
+      - name: Perform Merge
+        env:
+          BASE_BRANCH: ${{ github.event.repository.default_branch }}
+          BASE_REPOSITORY: ${{ github.repository }}
+        run: |
+          # Compare head branch and base branch
+          compare_result=$(curl -L -s --fail-with-body \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            "https://api.github.com/repos/$BASE_REPOSITORY/compare/$BASE_BRANCH...$PR_HEAD_LABEL")
+          # Assign multiple variables with one jq execution
+          if IFS=$'\n' read -d '' -r behind_by ahead_by <<<$(jq '.behind_by, .ahead_by' <<<$compare_result) ; [ -z "$behind_by" ] || [ -z "$ahead_by" ] ; then
+            echo '- Unable to determine the distance between the head branch and the base branch.' | tee -a "$GITHUB_STEP_SUMMARY"
+            exit 1
+          fi
+          if [ "$behind_by" -le 0 ] ; then
+            echo '- Skipping merge. Up-to-date with base branch.' | tee -a "$GITHUB_STEP_SUMMARY"
+            exit 0
+          else
+            echo '- Merging base branch. Head branch is behind by '"$behind_by"' commits and ahead by '"$ahead_by"' commits.' | tee -a "$GITHUB_STEP_SUMMARY"
+          fi
+
+          # Install Tools
+          chmod +x tools/bootstrap/python
+          bash tools/hooks/install.sh
+          bash tgui/bin/tgui --install-git-hooks
+          chmod +x tools/hooks/*.merge tgui/bin/tgui
+
+          # Actual Merge
+          git remote add upstream "https://github.com/$BASE_REPOSITORY.git"
+
+          git fetch origin "$PR_BRANCH" --depth=$((ahead_by + 1))
+          git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1))
+
+          # Check if a workflow file would be modified by the merge (permissions prevent pushes if so)
+          latest_workflow_commit=$(git log -n 1 --pretty=format:"%H" upstream/$BASE_BRANCH -- .github/workflows)
+          if ! git branch --contains $latest_workflow_commit | grep -q "$(git rev-parse --abbrev-ref HEAD)"; then
+            gh pr comment ${{ github.event.issue.html_url }} --body "GitHub Actions can not push to this branch as workflow files have been changed since your branch was last updated. Please update your branch past https://github.com/ParadiseSS13/Paradise/commit/$latest_workflow_commit before using this command again."
+            exit 0
+          fi
+
+          git merge FETCH_HEAD
+          git push origin
+
+      - name: Approve Workflows
+        run: |
+          # Get the list of pending workflow runs for paradisess13bot
+          runs=$(gh api \
+                  --method POST \
+                  -H "Accept: application/vnd.github+json" \
+                  -H "X-GitHub-Api-Version: 2022-11-28" \
+                  /repos/ParadiseSS13/Paradise/actions/runs?actor=paradisess13bot&status=action_required)
+          run_ids=$(echo $runs | jq -r '.workflow_runs[].id')
+
+          # Iterate over the run IDs, approving each one
+          for run_id in $run_ids; do
+              gh api \
+                --method POST \
+                -H "Accept: application/vnd.github+json" \
+                -H "X-GitHub-Api-Version: 2022-11-28" \
+                /repos/ParadiseSS13/Paradise/actions/runs/$run_id/approve
+          done
+
+      - name: Notify Failure
+        if: failure()
+        run: |
+          gh pr comment ${{ github.event.issue.html_url }} -b 'Merging upstream failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'

.github/workflows/render_nanomaps.yml

@@ -9,19 +9,23 @@ on:
     - cron: "0 0 * * *"
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 jobs:
   generate_maps:
-    permissions:
-      contents: write  # for Git to git push
-      pull-requests: write  # for repo-sync/pull-request to create pull requests
     name: 'Generate NanoMaps'
     runs-on: ubuntu-22.04
     steps:
+    - id: create_token
+      uses: actions/create-github-app-token@v1
+      with:
+        app-id: ${{ secrets.APP_ID }}
+        private-key: ${{ secrets.PRIVATE_KEY }}
+
+    - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"
+
     - name: 'Update Branch'
       uses: actions/checkout@v4
+      with:
+        token: ${{ steps.create_token.outputs.token }}
 
     - name: Branch
       run: |
@@ -32,20 +36,11 @@ jobs:
     - name: 'Generate Maps'
       run: './tools/github-actions/nanomap-renderer-invoker.sh'
 
-    - name: 'Commit Maps'
+    - name: 'Commit Maps and open PR'
       run: |
         git config --local user.email "action@github.com"
         git config --local user.name "NanoMap Generation"
         git pull origin master
         git commit -m "NanoMap Auto-Update (`date`)" -a || true
         git push -f -u origin nanomap-render
-
-    - name: Create Pull Request
-      uses: repo-sync/pull-request@v2
-      with:
-        source_branch: "nanomap-render"
-        destination_branch: "master"
-        pr_title: "Automatic NanoMap Update"
-        pr_body: "This pull request updates the server NanoMaps. Please review the diff images before merging."
-        pr_label: "NanoMaps"
-        pr_allow_empty: false
+        gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master"

.gitignore

@@ -5,6 +5,9 @@
 *.dmb
 *.lk
 
+# ignore tmp files generated by icon save operations
+/tmp/*
+
 #ignore any files in config/, except those in subdirectories.
 /config/*
 !config/**/*/

.vscode/settings.json

@@ -1,16 +1,16 @@
 {
 	"gitlens.advanced.blame.customArguments": [
-		"--ignore-revs-file", "${workspaceRoot}/.git-blame-ignore-revs"
+		"--ignore-revs-file",
+		"${workspaceRoot}/.git-blame-ignore-revs"
 	],
 	// ESLint settings:
-	"eslint.workingDirectories": [
-		"./tgui"
-	],
+	"eslint.workingDirectories": ["tgui/"],
 	"search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
+		"**/.yarn": true,
+		"**/.pnp.*": true
 	},
 	"eslint.nodePath": "tgui/.yarn/sdks",
+	"prettier.configPath": "tgui/.prettierrc.yml",
 	"prettier.prettierPath": "tgui/.yarn/sdks/prettier/index.cjs",
 	"typescript.tsdk": "tgui/.yarn/sdks/typescript/lib",
 	"typescript.enablePromptUseWorkspaceTsdk": true,

SQL/paradise_schema.sql

@@ -79,6 +79,7 @@ CREATE TABLE `characters` (
   `hair_gradient_colour` varchar(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#000000',
   `hair_gradient_alpha` tinyint(3) UNSIGNED NOT NULL DEFAULT '255',
   `custom_emotes` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL,
+  `cyborg_brain_type` ENUM('MMI', 'Robobrain', 'Positronic') NOT NULL DEFAULT 'MMI',
   PRIMARY KEY (`id`),
   KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=125467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

SQL/updates/53-54.sql

@@ -0,0 +1,5 @@
+#Updating SQL from 53 to 54 -Wilk
+#Add a choice for what type of brain borgs want to have
+
+ALTER TABLE `characters`
+	ADD COLUMN `cyborg_brain_type` VARCHAR(11) NOT NULL DEFAULT 'MMI' AFTER `height`;

_build_dependencies.sh

@@ -1,16 +1,16 @@
 # This file has all the information on what versions of libraries are thrown into the code
 # For dreamchecker
-export SPACEMANDMM_TAG=suite-1.7.1
+export SPACEMANDMM_TAG=suite-1.8
 # For TGUI
 export NODE_VERSION=20
 # Stable Byond Major
 export STABLE_BYOND_MAJOR=515
 # Stable Byond Minor
-export STABLE_BYOND_MINOR=1630
-# Beta Byond Major
-export BETA_BYOND_MAJOR=515
-# Beta Byond Minor
-export BETA_BYOND_MINOR=1630
+export STABLE_BYOND_MINOR=1633
+# Beta Byond Major - Uncomment and update if beta cycle active
+#export BETA_BYOND_MAJOR=515
+# Beta Byond Minor - Uncomment and update if beta cycle active
+#export BETA_BYOND_MINOR=1633
 # Python version for mapmerge and other tools
 export PYTHON_VERSION=3.11.6
 # RUSTG version

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm

@@ -3,30 +3,26 @@
 /turf/template_noop,
 /area/template_noop)
 "ab" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/wall/r_wall,
 /area/ruin/powered/clownplanet)
 "ac" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/wall/r_wall,
 /area/ruin/powered/clownplanet)
 "ad" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
 "ae" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
@@ -75,9 +71,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -129,9 +124,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -172,9 +166,8 @@
 /area/ruin/powered/clownplanet)
 "ao" = (
 /obj/structure/window/reinforced,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
@@ -189,9 +182,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -253,23 +245,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
-"av" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/floor/lubed,
-/area/ruin/powered/clownplanet)
 "aw" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -284,9 +259,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -302,9 +276,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -320,19 +293,11 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
-"aA" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/turf/simulated/wall/r_wall,
-/area/ruin/powered/clownplanet)
 "aB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -365,9 +330,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -390,9 +354,8 @@
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
 "aE" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
@@ -427,9 +390,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -448,9 +410,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -549,9 +510,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -608,9 +568,8 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
@@ -630,9 +589,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
 "aV" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -640,9 +598,8 @@
 	},
 /area/ruin/powered/clownplanet)
 "aW" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -711,9 +668,8 @@
 /turf/simulated/floor/light,
 /area/ruin/powered/clownplanet)
 "bd" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -724,9 +680,8 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -760,9 +715,8 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/powered/clownplanet)
@@ -778,16 +732,14 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
 "bk" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
 	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
@@ -803,16 +755,14 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
 "bm" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
@@ -905,9 +855,8 @@
 /area/ruin/powered/clownplanet)
 "bu" = (
 /obj/effect/decal/cleanable/blood/oil,
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/plating,
 /area/ruin/powered/clownplanet)
@@ -937,9 +886,8 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/powered/clownplanet)
@@ -955,7 +903,7 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
 "by" = (
@@ -1149,9 +1097,8 @@
 /turf/simulated/floor/lubed,
 /area/ruin/powered/clownplanet)
 "sL" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/light,
 /area/ruin/powered/clownplanet)
@@ -1171,9 +1118,8 @@
 /turf/simulated/wall/r_wall,
 /area/ruin/powered/clownplanet)
 "HG" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/light,
 /area/ruin/powered/clownplanet)
@@ -1245,9 +1191,8 @@
 /turf/simulated/floor/noslip/lavaland,
 /area/ruin/powered/clownplanet)
 "VH" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/wall/r_wall,
 /area/ruin/powered/clownplanet)
@@ -1406,9 +1351,9 @@ ye
 ye
 ye
 ab
-aA
+EG
 ab
-aA
+EG
 ye
 cc
 cc
@@ -1443,7 +1388,7 @@ VH
 aH
 ay
 aS
-aA
+EG
 ye
 cc
 cc
@@ -1476,7 +1421,7 @@ ah
 af
 aI
 af
-av
+qo
 aL
 ye
 cc
@@ -1509,7 +1454,7 @@ ap
 am
 ah
 af
-aA
+EG
 aL
 aL
 cc
@@ -1539,7 +1484,7 @@ ye
 ye
 ae
 af
-av
+qo
 am
 aL
 aX
@@ -1607,7 +1552,7 @@ ye
 ac
 ag
 af
-av
+qo
 aL
 am
 aL
@@ -1718,7 +1663,7 @@ aL
 aL
 bi
 ch
-aA
+EG
 cc
 cc
 cc
@@ -1787,7 +1732,7 @@ ay
 as
 an
 aC
-av
+qo
 cc
 dK
 bQ
@@ -1811,16 +1756,16 @@ cc
 ye
 cu
 ah
-aA
+EG
 ah
-av
+qo
 ah
 af
 af
 au
 bk
 aC
-av
+qo
 bj
 ch
 bN
@@ -1851,7 +1796,7 @@ aL
 an
 aO
 af
-av
+qo
 bl
 bo
 ay
@@ -1886,9 +1831,9 @@ WZ
 WZ
 qo
 aC
-av
+qo
 bp
-aA
+EG
 bv
 cc
 bL
@@ -1957,7 +1902,7 @@ bb
 bm
 aL
 bu
-aA
+EG
 bB
 bB
 cc

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm

@@ -3,7 +3,7 @@
 /turf/template_noop,
 /area/template_noop)
 "ab" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/plating/asteroid/snow/atmosphere,
 /area/ruin/powered/snow_biodome)
 "ac" = (
@@ -250,6 +250,10 @@
 	},
 /turf/simulated/floor/plating/asteroid/snow/atmosphere,
 /area/ruin/powered/snow_biodome)
+"bJ" = (
+/mob/living/simple_animal/hostile/bear/polar,
+/turf/simulated/floor/plating/asteroid/snow/atmosphere,
+/area/ruin/powered/snow_biodome)
 "bM" = (
 /obj/machinery/light,
 /turf/simulated/floor/plating/asteroid/snow/atmosphere,
@@ -287,9 +291,9 @@
 	},
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/pod/dark{
-	oxygen = 14;
-	nitrogen = 23;
-	temperature = 300
+	oxygen = 8;
+	nitrogen = 14;
+	temperature = 500
 	},
 /area/ruin/powered/snow_biodome)
 "jE" = (
@@ -1267,7 +1271,7 @@ aB
 ak
 ak
 aC
-ak
+bJ
 Wg
 QI
 tb

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm

@@ -817,9 +817,7 @@
 	dir = 6
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/off_station/empty_charge{
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/north,
 /turf/simulated/floor/plating/airless,
 /area/ruin/unpowered/althland_excavation)
 "pI" = (
@@ -1131,7 +1129,6 @@
 /area/lavaland/surface/outdoors)
 "Es" = (
 /obj/structure/lattice/catwalk/mining,
-/obj/effect/baseturf_helper/lava_land/surface,
 /obj/effect/mapping_helpers/no_lava,
 /obj/structure/ladder/unusable,
 /turf/simulated/floor/chasm,
@@ -1368,7 +1365,7 @@
 /area/ruin/unpowered/althland_excavation)
 "Rf" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/pod/light{
 	oxygen = 0;
 	nitrogen = 0
@@ -1513,6 +1510,10 @@
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/plating/airless,
 /area/ruin/unpowered/althland_excavation)
+"XS" = (
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/simulated/wall/r_wall,
+/area/lavaland/surface/outdoors)
 "Ya" = (
 /obj/structure/railing,
 /obj/effect/decal/cleanable/dirt,
@@ -1809,10 +1810,10 @@ aB
 aB
 aA
 TD
-TN
+XS
 Ei
 zp
-TN
+XS
 BW
 aB
 Ei
@@ -1972,7 +1973,7 @@ aB
 aB
 aL
 or
-TN
+XS
 Ei
 Ei
 TN
@@ -2001,7 +2002,7 @@ aB
 aB
 aB
 aB
-TN
+XS
 eC
 Ei
 Ei

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

@@ -67,7 +67,7 @@
 /turf/simulated/mineral/volcanic/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "am" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/wall/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "aq" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm

@@ -24,7 +24,7 @@
 /turf/simulated/floor/engine/cult/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "h" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/wall/cult,
 /area/ruin/unpowered/misc_lavaruin)
 "i" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm

@@ -100,7 +100,7 @@
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/misc_lavaruin)
 "q" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/misc_lavaruin)
 "A" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_fountain_hall.dmm

@@ -29,7 +29,7 @@
 /turf/simulated/floor/engine/cult,
 /area/ruin/unpowered/misc_lavaruin)
 "i" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/engine/cult,
 /area/ruin/unpowered/misc_lavaruin)
 

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm

@@ -9,7 +9,7 @@
 /turf/simulated/floor/lava/mapping_lava,
 /area/lavaland/surface/outdoors)
 "d" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/gluttony)
 "e" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_greed.dmm

@@ -9,7 +9,7 @@
 /turf/simulated/floor/lava/mapping_lava,
 /area/lavaland/surface/outdoors)
 "d" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/engine/cult,
 /area/ruin/powered/greed)
 "e" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm

@@ -11,14 +11,11 @@
 "d" = (
 /obj/item/clothing/head/helmet/space/syndicate/orange,
 /obj/item/clothing/mask/breath,
-/turf/simulated/floor/plating/asteroid/basalt,
+/turf/simulated/floor/plating,
 /area/ruin/powered)
 "e" = (
 /obj/item/clothing/suit/space/syndicate/orange,
-/turf/simulated/floor/plating/asteroid/basalt,
-/area/ruin/powered)
-"f" = (
-/turf/simulated/floor/plating/asteroid/basalt,
+/turf/simulated/floor/plating,
 /area/ruin/powered)
 "g" = (
 /turf/simulated/floor/plating/asteroid{
@@ -60,8 +57,7 @@
 /obj/item/seeds/reishi,
 /obj/item/seeds/plump,
 /obj/item/seeds/plump,
-/obj/item/food/snacks/grown/mushroom/glowshroom,
-/turf/simulated/floor/plating/asteroid/basalt,
+/turf/simulated/floor/plating,
 /area/ruin/powered)
 "n" = (
 /obj/machinery/hydroponics/soil,
@@ -75,7 +71,7 @@
 /obj/item/storage/bag/plants/portaseeder,
 /obj/item/storage/bag/ore,
 /obj/item/storage/firstaid/regular,
-/turf/simulated/floor/plating/asteroid/basalt,
+/turf/simulated/floor/plating,
 /area/ruin/powered)
 "q" = (
 /obj/structure/glowshroom,
@@ -85,7 +81,7 @@
 /obj/structure/rack,
 /obj/item/pickaxe/emergency,
 /obj/item/tank/internals/oxygen,
-/turf/simulated/floor/plating/asteroid/basalt,
+/turf/simulated/floor/plating,
 /area/ruin/powered)
 "s" = (
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
@@ -170,9 +166,9 @@
 "J" = (
 /obj/effect/spawner/window/shuttle,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/powered)
 "K" = (
@@ -181,7 +177,7 @@
 /area/ruin/powered)
 "X" = (
 /obj/item/flashlight/lantern,
-/turf/simulated/floor/plating/asteroid/basalt,
+/turf/simulated/floor/plating,
 /area/ruin/powered)
 
 (1,1,1) = {"
@@ -316,7 +312,7 @@ b
 b
 b
 c
-f
+g
 o
 q
 K
@@ -331,11 +327,11 @@ s
 (9,1,1) = {"
 b
 b
-f
-i
 g
-f
-f
+i
+o
+g
+g
 o
 o
 o
@@ -352,9 +348,9 @@ d
 g
 j
 g
+o
+g
 g
-f
-f
 u
 o
 A
@@ -385,7 +381,7 @@ s
 (12,1,1) = {"
 b
 b
-f
+o
 k
 X
 b

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hierophant.dmm

@@ -27,7 +27,7 @@
 /turf/simulated/floor/indestructible/hierophant/two,
 /area/ruin/unpowered/hierophant)
 "g" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/indestructible/hierophant/two,
 /area/ruin/unpowered/hierophant)
 

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_monster_nest.dmm

@@ -34,7 +34,7 @@
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "W" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /obj/effect/mapping_helpers/no_lava,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm

@@ -15,53 +15,53 @@
 "e" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "f" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/cups,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "g" = (
 /obj/structure/reagent_dispensers/water_cooler/pizzaparty,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "h" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "i" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "j" = (
 /obj/item/food/snacks/mushroompizzaslice,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "k" = (
@@ -69,9 +69,9 @@
 /obj/effect/spawner/lootdrop/pizzaparty,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "l" = (
@@ -83,54 +83,54 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb2,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "m" = (
 /obj/item/chair/wood/wings,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "n" = (
 /obj/structure/glowshroom,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "o" = (
 /obj/item/trash/plate,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "p" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "q" = (
 /obj/item/chair/wood/wings,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "r" = (
@@ -141,33 +141,33 @@
 	name = "party hat"
 	},
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "s" = (
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "t" = (
 /obj/structure/chair/wood/wings,
 /obj/effect/decal/remains/human,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "u" = (
 /obj/structure/glowshroom,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "v" = (
@@ -179,27 +179,27 @@
 /obj/item/kitchen/utensil/fork,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "x" = (
 /obj/structure/table/wood,
 /obj/effect/spawner/lootdrop/pizzaparty,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "y" = (
 /obj/structure/table/wood,
 /obj/item/trash/plate,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "z" = (
@@ -207,9 +207,9 @@
 /obj/structure/glowshroom,
 /obj/item/a_gift,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "A" = (
@@ -217,17 +217,17 @@
 /obj/item/trash/plate,
 /obj/item/kitchen/utensil/fork,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "B" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "C" = (
@@ -236,9 +236,9 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "D" = (
@@ -246,61 +246,61 @@
 /obj/item/food/snacks/margheritapizzaslice,
 /obj/item/trash/plate,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "E" = (
 /obj/structure/table/wood,
 /obj/item/food/snacks/meatpizzaslice,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "F" = (
 /obj/structure/table/wood,
 /obj/item/food/snacks/sliceable/birthdaycake,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "G" = (
 /obj/structure/table/wood,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "H" = (
 /obj/item/chair/wood/wings,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "I" = (
 /obj/item/kitchen/utensil/fork,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "J" = (
 /obj/structure/glowshroom,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "K" = (
@@ -310,27 +310,27 @@
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "L" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "M" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/a_gift,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "N" = (
@@ -342,9 +342,9 @@
 /obj/item/kitchen/knife,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "P" = (
@@ -353,16 +353,16 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "Q" = (
 /turf/simulated/floor/plating{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/unpowered/misc_lavaruin)
 

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pride.dmm

@@ -9,7 +9,7 @@
 /turf/simulated/floor/lava/mapping_lava,
 /area/lavaland/surface/outdoors)
 "d" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/mineral/silver,
 /area/ruin/powered/pride)
 "e" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -102,7 +102,7 @@
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "hO" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "im" = (
@@ -301,9 +301,8 @@
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "DZ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
@@ -338,14 +337,14 @@
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "IJ" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 4;
 	name = "Ship Auto-Pilot Console"
 	},
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "JL" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 4;
 	name = "Auto-Pilot Traveling Logs"
 	},
@@ -380,9 +379,8 @@
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "OL" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
@@ -403,7 +401,7 @@
 /obj/item/seeds/grass{
 	name = "modificated pack of grass seeds"
 	},
-/obj/item/paper/seed_vault/terraformation,
+/obj/item/paper/seed_vault/terraforming_introduction,
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "QX" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm

@@ -38,7 +38,7 @@
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "h" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/sepia{
 	slowdown = 10
 	},

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm

@@ -93,7 +93,7 @@
 /obj/structure/tubes,
 /obj/item/crowbar,
 /obj/effect/decal/cleanable/blood/drip,
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/pod/dark,
 /area/ruin/powered)
 "s" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm

@@ -32,7 +32,7 @@
 /turf/simulated/floor/plating/abductor/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "k" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/plating/abductor/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "l" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm

@@ -9,7 +9,7 @@
 /area/ruin/unpowered/xenonest)
 "c" = (
 /obj/structure/alien/weeds,
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "d" = (
@@ -36,15 +36,15 @@
 /obj/structure/bed/nest,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
-"j" = (
-/obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/ruin/unpowered/xenonest)
 "l" = (
 /obj/structure/alien/weeds/node,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"n" = (
+/obj/structure/alien/weeds,
+/mob/living/simple_animal/hostile/alien/lavaland,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
 "o" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -60,7 +60,7 @@
 /area/ruin/unpowered/xenonest)
 "t" = (
 /obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien/sentinel,
+/mob/living/simple_animal/hostile/alien/sentinel/lavaland,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "u" = (
@@ -108,19 +108,12 @@
 /area/ruin/unpowered/xenonest)
 "E" = (
 /obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien/drone{
-	plants_off = 1
-	},
+/mob/living/simple_animal/hostile/alien/drone/lavaland,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "F" = (
 /obj/structure/alien/weeds,
-/mob/living/simple_animal/hostile/alien/queen/large{
-	desc = "A gigantic alien who is in charge of the hive and all of its loyal servants.";
-	name = "alien queen";
-	pixel_x = -16;
-	plants_off = 1
-	},
+/mob/living/simple_animal/hostile/alien/queen/large/lavaland,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "G" = (
@@ -142,14 +135,7 @@
 /area/ruin/unpowered/xenonest)
 "K" = (
 /obj/structure/alien/weeds/node,
-/mob/living/simple_animal/hostile/alien,
-/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
-/area/ruin/unpowered/xenonest)
-"L" = (
-/obj/structure/alien/weeds/node,
-/mob/living/simple_animal/hostile/alien/drone{
-	plants_off = 1
-	},
+/mob/living/simple_animal/hostile/alien/drone/lavaland,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "M" = (
@@ -169,15 +155,18 @@
 "Q" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood,
-/mob/living/simple_animal/hostile/alien/drone{
-	plants_off = 1
-	},
+/mob/living/simple_animal/hostile/alien/drone/lavaland,
 /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
 "R" = (
 /obj/structure/alien/weeds,
 /turf/template_noop,
 /area/ruin/unpowered/xenonest)
+"X" = (
+/obj/structure/alien/weeds/node,
+/mob/living/simple_animal/hostile/alien/lavaland,
+/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
 
 (1,1,1) = {"
 a
@@ -683,7 +672,7 @@ a
 b
 b
 g
-j
+n
 g
 e
 b
@@ -699,7 +688,7 @@ a
 a
 a
 b
-E
+n
 g
 b
 b
@@ -854,7 +843,7 @@ a
 (22,1,1) = {"
 d
 f
-j
+E
 g
 b
 b
@@ -967,7 +956,7 @@ a
 a
 b
 g
-L
+K
 b
 b
 b
@@ -1084,7 +1073,7 @@ a
 b
 z
 C
-j
+n
 g
 e
 i
@@ -1410,7 +1399,7 @@ b
 b
 g
 g
-K
+X
 g
 g
 b

_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm

@@ -8,7 +8,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/abandoned_engi_sat)
 "aN" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -79,9 +79,8 @@
 	},
 /area/ruin/space/abandoned_engi_sat)
 "cK" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /obj/effect/spawner/random_spawners/wall_rusted_probably,
 /turf/simulated/wall,
@@ -188,9 +187,7 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
-/obj/machinery/power/apc/off_station/empty_charge{
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/south,
 /obj/effect/landmark/burnturf,
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
@@ -245,9 +242,8 @@
 /turf/simulated/floor/carpet/airless,
 /area/ruin/space/abandoned_engi_sat)
 "hE" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -664,7 +660,7 @@
 	},
 /area/ruin/space/abandoned_engi_sat)
 "tO" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
@@ -917,7 +913,7 @@
 /turf/template_noop,
 /area/ruin/space/abandoned_engi_sat)
 "CY" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
@@ -929,9 +925,8 @@
 	},
 /area/ruin/space/abandoned_engi_sat)
 "De" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /obj/effect/spawner/random_spawners/wall_rusted_always,
 /turf/simulated/wall/r_wall,
@@ -1104,7 +1099,7 @@
 	pixel_y = 1;
 	d2 = 2
 	},
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"

_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm

@@ -345,10 +345,7 @@
 	},
 /area/ruin/space/unpowered)
 "aS" = (
-/obj/machinery/power/apc/worn_out{
-	dir = 8;
-	pixel_x = -24
-	},
+/obj/machinery/power/apc/worn_out/directional/west,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -648,17 +645,15 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/unpowered)
 "by" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/wall/r_wall,
 /area/ruin/space/unpowered)
 "bz" = (
 /obj/machinery/space_heater,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /obj/machinery/light{
 	dir = 8

_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm

@@ -823,11 +823,7 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
 "YN" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "Worn-out APC";
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/worn_out/directional/north,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-2"

_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm

@@ -122,9 +122,7 @@
 /turf/space,
 /area/space)
 "O" = (
-/obj/machinery/power/apc/worn_out{
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/worn_out/directional/south,
 /obj/structure/cable,
 /turf/simulated/floor/plating/airless,
 /area/space)

_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm

@@ -667,11 +667,9 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "bG" = (
-/obj/machinery/power/apc/off_station{
-	dir = 8;
+/obj/machinery/power/apc/off_station/directional/west{
 	keep_preset_name = 1;
-	name = "Bunker APC";
-	pixel_x = -24
+	name = "Bunker APC"
 	},
 /obj/structure/cable{
 	d2 = 4;

_maps/map_files/RandomRuins/SpaceRuins/dj.dmm

@@ -275,10 +275,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station{
-	name = "Worn-out APC";
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/worn_out/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/ruin/space/djstation)

_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm

@@ -80,11 +80,8 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc{
-	dir = 4;
-	layer = 5;
-	name = "east bump";
-	pixel_x = 24
+/obj/machinery/power/apc/directional/east{
+	layer = 5
 	},
 /turf/simulated/floor/plating,
 /area/ruin/space/methlab)

_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm

@@ -199,6 +199,7 @@
 	name = "mission briefing"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/item/paper/monitorkey,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/syndicate_listening_station)
 "un" = (
@@ -618,11 +619,7 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/syndicate_listening_station)
 "Ya" = (
-/obj/machinery/power/apc/off_station{
-	dir = 4;
-	pixel_x = 24;
-	req_access = list(150)
-	},
+/obj/machinery/power/apc/syndicate/directional/east,
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"

_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm

@@ -140,14 +140,11 @@
 	icon_state = "0-2";
 	pixel_y = 1
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	environment_channel = 2;
 	equipment_channel = 0;
 	lighting_channel = 0;
-	locked = 0;
-	pixel_y = 24;
-	req_access = ""
+	locked = 0
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -460,14 +457,11 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	equipment_channel = 0;
 	lighting_channel = 0;
 	locked = 0;
-	operating = 0;
-	pixel_y = 24;
-	req_access = ""
+	operating = 0
 	},
 /turf/simulated/floor/carpet,
 /area/ruin/unpowered/BMPship/Fore)
@@ -798,13 +792,10 @@
 	icon_state = "0-2";
 	pixel_y = 1
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	environment_channel = 0;
 	locked = 0;
-	operating = 0;
-	pixel_y = 24;
-	req_access = ""
+	operating = 0
 	},
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/BMPship/Aft)
@@ -1165,12 +1156,9 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
+/obj/machinery/power/apc/off_station/directional/north{
 	locked = 0;
-	operating = 0;
-	pixel_y = 24;
-	req_access = ""
+	operating = 0
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -1226,9 +1214,8 @@
 	},
 /area/ruin/unpowered/BMPship/Midship)
 "dZ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -1377,9 +1364,8 @@
 	},
 /area/ruin/unpowered/BMPship/Midship)
 "es" = (
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -1652,9 +1638,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/BMPship/Midship)
 "fh" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
@@ -1730,9 +1715,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/BMPship/Midship)
 "fs" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"

_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm

@@ -1071,7 +1071,7 @@
 /turf/simulated/wall/mineral/titanium,
 /area/ruin/space/powered)
 "dh" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/mineral/titanium,
 /area/ruin/space/powered)
@@ -2307,7 +2307,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb2,
 /turf/simulated/floor/plasteel{
@@ -3170,7 +3170,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -6141,8 +6141,8 @@
 "vh" = (
 /obj/structure/rack,
 /obj/item/mecha_parts/core,
-/obj/item/stock_parts/cell/infinite,
 /obj/effect/turf_decal/delivery/hollow,
+/obj/item/stock_parts/cell/infinite/abductor,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -6367,7 +6367,7 @@
 	},
 /area/ruin/space/moonbase19)
 "wk" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plating/asteroid/ancient,
 /area/ruin/space/moonbase19)
 "wl" = (
@@ -6431,7 +6431,7 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -6736,7 +6736,7 @@
 /turf/simulated/floor/carpet,
 /area/ruin/space/moonbase19)
 "yc" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -8441,7 +8441,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/space/moonbase19)
 "Ff" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -8816,7 +8816,7 @@
 	},
 /area/ruin/space/moonbase19)
 "GP" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -9476,13 +9476,9 @@
 /area/ruin/space/moonbase19)
 "JU" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/power/apc/off_station/empty_charge{
+/obj/machinery/power/apc/off_station/empty_charge/directional/north{
 	cell_type = 15000;
-	locked = 0;
-	name = "Outpost APC";
-	req_access = null;
-	pixel_y = 24;
-	dir = 1
+	locked = 0
 	},
 /obj/structure/cable{
 	d2 = 4;
@@ -10526,9 +10522,7 @@
 	},
 /area/ruin/space/moonbase19)
 "On" = (
-/obj/structure/safe/floor{
-	known_by = list("captain")
-	},
+/obj/structure/safe/floor,
 /obj/structure/sign/singulo{
 	pixel_y = 32
 	},
@@ -11565,7 +11559,7 @@
 	},
 /area/ruin/space/moonbase19)
 "Tc" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -12230,7 +12224,7 @@
 /turf/simulated/wall/r_wall,
 /area/ruin/space/moonbase19)
 "VO" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/catwalk,
 /area/ruin/space/moonbase19)
@@ -12545,7 +12539,7 @@
 	},
 /area/ruin/space/moonbase19)
 "Xi" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -13121,7 +13115,7 @@
 /turf/simulated/floor/carpet/royalblue,
 /area/ruin/space/moonbase19)
 "Zu" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /obj/structure/window/reinforced{
 	dir = 4
 	},

_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm

@@ -94,27 +94,18 @@
 /area/ruin/ancientstation/comm)
 "au" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/comm)
 "av" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /obj/item/paper/fluff/ruins/oldstation/damagereport,
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/comm)
 "aw" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /obj/item/paper/fluff/ruins/oldstation/report,
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/comm)
@@ -164,11 +155,7 @@
 /area/ruin/ancientstation/hivebot)
 "aE" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 4;
-	name = "Beta Engineering APC";
-	pixel_x = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/east,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/airless,
 /area/ruin/ancientstation/atmo)
@@ -372,10 +359,7 @@
 /area/ruin/ancientstation/comm)
 "bi" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "blue"
@@ -383,10 +367,7 @@
 /area/ruin/ancientstation/comm)
 "bj" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "blue"
@@ -1014,11 +995,7 @@
 	icon_state = "0-4"
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 1;
-	name = "Theta Prototype Lab APC";
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/north,
 /turf/simulated/floor/plasteel/white,
 /area/ruin/ancientstation/proto)
 "cW" = (
@@ -1070,11 +1047,7 @@
 /area/ruin/ancientstation/comm)
 "dd" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 4;
-	name = "Charlie Main Corridor APC";
-	pixel_x = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/east,
 /obj/structure/closet/crate,
 /obj/item/storage/backpack/old,
 /obj/item/storage/backpack/old,
@@ -1217,10 +1190,7 @@
 	},
 /area/ruin/ancientstation/comm)
 "dy" = (
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/sec)
@@ -1408,11 +1378,7 @@
 	pixel_y = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 4;
-	name = "Charlie Command APC";
-	pixel_x = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/east,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation/comm)
 "dY" = (
@@ -1420,10 +1386,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/sec)
 "dZ" = (
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -2479,11 +2442,7 @@
 	icon_state = "0-2";
 	pixel_y = 1
 	},
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 8;
-	name = "Charlie Security APC";
-	pixel_x = -24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/west,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -2828,10 +2787,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/thetacorridor)
 "gX" = (
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /obj/item/card/id/away/old/apc,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
@@ -3394,11 +3350,7 @@
 	pixel_y = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 1;
-	name = "Theta Main Corridor APC";
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/north,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation/thetacorridor)
 "ie" = (
@@ -3769,11 +3721,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 1;
-	name = "Charlie Hydroponics APC";
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/north,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation/hydroponics)
@@ -4046,10 +3994,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station/empty_charge{
-	name = "Charlie Kitchen APC";
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/south,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/ruin/ancientstation/kitchen)
@@ -4075,11 +4020,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 4;
-	name = "Theta RnD APC";
-	pixel_x = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/east,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/rnd)
@@ -4261,10 +4202,7 @@
 /area/ruin/ancientstation)
 "kf" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/plasteel,
 /area/ruin/ancientstation/powered)
 "kg" = (
@@ -4438,10 +4376,7 @@
 /turf/simulated/floor/plasteel/white,
 /area/ruin/ancientstation/proto)
 "kA" = (
-/obj/machinery/computer{
-	desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages.";
-	name = "Broken Computer"
-	},
+/obj/machinery/computer/nonfunctional,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/white,
 /area/ruin/ancientstation/proto)
@@ -4643,11 +4578,7 @@
 /obj/structure/rack,
 /obj/item/stack/cable_coil,
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station/empty_charge{
-	dir = 4;
-	name = "Charlie Engineering APC";
-	pixel_x = 24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/east,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel{
 	dir = 6;

_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm

@@ -254,11 +254,7 @@
 	dir = 4
 	},
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station{
-	keep_preset_name = 1;
-	name = "Hallway APC";
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/off_station/directional/south,
 /turf/simulated/floor/plasteel/airless,
 /area/ruin/space/onehalf/hallway)
 "aM" = (
@@ -582,9 +578,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/drone_bay)
 "br" = (
-/obj/structure/disposalpipe/junction{
-	dir = 1;
-	icon_state = "pipe-y"
+/obj/structure/disposalpipe/junction/y{
+	dir = 1
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/drone_bay)
@@ -681,9 +676,8 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/drone_bay)
 "bF" = (
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/drone_bay)
@@ -866,9 +860,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/onehalf/abandonedbridge)
 "cp" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /obj/structure/table,
 /obj/item/paper_bin,
@@ -1288,12 +1281,7 @@
 /obj/item/healthanalyzer,
 /obj/item/reagent_containers/iv_bag/blood/OMinus,
 /obj/item/reagent_containers/iv_bag/blood/OMinus,
-/obj/machinery/power/apc/off_station{
-	dir = 4;
-	keep_preset_name = 1;
-	name = "Crew Quarters APC";
-	pixel_x = 24
-	},
+/obj/machinery/power/apc/off_station/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -1303,12 +1291,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
-	keep_preset_name = 1;
-	name = "Mining Drone Bay APC";
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/directional/north,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
@@ -1329,12 +1312,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
-	keep_preset_name = 1;
-	name = "Bridge APC";
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/directional/north,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/abandonedbridge)
 

_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm

@@ -30,9 +30,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/syndicate_druglab)
 "gU" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 2
 	},
 /turf/simulated/floor/pod/dark,
 /area/ruin/space/syndicate_druglab)
@@ -60,10 +59,7 @@
 /turf/simulated/floor/pod/dark,
 /area/ruin/space/syndicate_druglab)
 "mA" = (
-/obj/machinery/power/apc/syndicate/off{
-	pixel_x = 24;
-	dir = 4
-	},
+/obj/machinery/power/apc/syndicate/off/directional/east,
 /turf/simulated/floor/plating,
 /area/ruin/space/syndicate_druglab)
 "mO" = (
@@ -183,9 +179,8 @@
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
 	},
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/ruin/space/syndicate_druglab)
@@ -318,9 +313,8 @@
 /area/ruin/space/syndicate_druglab)
 "II" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/ruin/space/syndicate_druglab)
@@ -339,9 +333,8 @@
 /area/ruin/space/syndicate_druglab)
 "LQ" = (
 /obj/effect/turf_decal/stripes/corner,
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment/corner{
+	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/ruin/space/syndicate_druglab)

_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm

@@ -66,7 +66,7 @@
 	d2 = 2;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/syndicate/south,
+/obj/machinery/power/apc/syndicate/directional/south,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/syndicate_space_base/testlab)
 "aq" = (
@@ -742,7 +742,7 @@
 	d2 = 2;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/syndicate/east,
+/obj/machinery/power/apc/syndicate/directional/east,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkpurple"
@@ -1021,7 +1021,7 @@
 	d2 = 2;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/syndicate/west,
+/obj/machinery/power/apc/syndicate/directional/west,
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/syndicate_space_base/engineering)
 "fF" = (
@@ -1290,7 +1290,7 @@
 	dir = 1
 	},
 /obj/structure/table/wood,
-/obj/machinery/computer/library,
+/obj/machinery/computer/library/syndie,
 /turf/simulated/floor/wood,
 /area/ruin/unpowered/syndicate_space_base/arrivals)
 "gW" = (
@@ -1803,10 +1803,6 @@
 	icon_state = "grimy"
 	},
 /area/ruin/unpowered/syndicate_space_base/service)
-"jC" = (
-/obj/machinery/mech_bay_recharge_port,
-/turf/simulated/floor/redgrid,
-/area/ruin/unpowered/syndicate_space_base/main)
 "jH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1893,7 +1889,7 @@
 	d2 = 2;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/syndicate/north,
+/obj/machinery/power/apc/syndicate/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whiteblue"
@@ -1932,7 +1928,7 @@
 /obj/machinery/atmospherics/meter{
 	layer = 3.3
 	},
-/obj/machinery/atmospherics/pipe/simple/insulated{
+/obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
@@ -1986,7 +1982,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/syndicate_space_base/testlab)
 "kK" = (
-/obj/machinery/power/apc/syndicate/south,
+/obj/machinery/power/apc/syndicate/directional/south,
 /obj/structure/cable/green,
 /turf/simulated/floor/plasteel{
 	icon_state = "grimy"
@@ -2119,7 +2115,7 @@
 	d2 = 2;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/syndicate/east,
+/obj/machinery/power/apc/syndicate/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -2162,7 +2158,7 @@
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/syndicate_space_base/atmos)
 "lW" = (
-/obj/machinery/power/apc/syndicate/north,
+/obj/machinery/power/apc/syndicate/directional/north,
 /obj/structure/cable/green{
 	d2 = 2;
 	icon_state = "0-2"
@@ -2946,7 +2942,7 @@
 /area/ruin/unpowered/syndicate_space_base/chemistry)
 "pH" = (
 /obj/structure/cable/green,
-/obj/machinery/power/apc/syndicate/west,
+/obj/machinery/power/apc/syndicate/directional/west,
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/syndicate_space_base/atmos)
 "pM" = (
@@ -3421,12 +3417,6 @@
 	icon_state = "dark"
 	},
 /area/ruin/unpowered/syndicate_space_base/main)
-"sX" = (
-/mob/living/simple_animal/bot/ed209/syndicate,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/ruin/unpowered/syndicate_space_base/main)
 "tb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -3769,7 +3759,7 @@
 	d2 = 2;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/syndicate/north,
+/obj/machinery/power/apc/syndicate/directional/north,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -3969,7 +3959,7 @@
 /area/ruin/unpowered/syndicate_space_base/main)
 "vO" = (
 /obj/structure/cable/green,
-/obj/machinery/power/apc/syndicate/west,
+/obj/machinery/power/apc/syndicate/directional/west,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -4699,7 +4689,7 @@
 /obj/machinery/computer/general_air_control/large_tank_control{
 	inlet_injector_autolink_id = "syndiebase_mix_in";
 	outlet_vent_autolink_id = "syndiebase_mix_out";
-	autolink_sensors = list("syndiebase_mix_sensor"="Burn Mix");
+	autolink_sensors = list("syndiebase_mix_sensor" = "Burn Mix");
 	dir = 8
 	},
 /turf/simulated/floor/plating,
@@ -4787,12 +4777,12 @@
 /obj/machinery/atmospherics/meter{
 	layer = 3.3
 	},
-/obj/machinery/atmospherics/pipe/simple/insulated{
-	dir = 4
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/visible{
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/syndicate_space_base/atmos)
 "Ao" = (
@@ -5219,7 +5209,7 @@
 /area/ruin/unpowered/syndicate_space_base/arrivals)
 "CS" = (
 /obj/structure/cable/green,
-/obj/machinery/power/apc/syndicate/east,
+/obj/machinery/power/apc/syndicate/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -5271,7 +5261,7 @@
 	d2 = 2;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/syndicate/south,
+/obj/machinery/power/apc/syndicate/directional/south,
 /turf/simulated/floor/catwalk,
 /area/ruin/unpowered/syndicate_space_base/toxtest)
 "Dl" = (
@@ -5408,7 +5398,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/syndicate/north,
+/obj/machinery/power/apc/syndicate/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkblue"
@@ -5783,18 +5773,6 @@
 	icon_state = "yellow"
 	},
 /area/ruin/unpowered/syndicate_space_base/atmos)
-"FV" = (
-/obj/machinery/door_control{
-	name = "Syndicate Sentry Bot Storage Door Control";
-	pixel_x = 24;
-	pixel_y = 24;
-	req_access_txt = "151";
-	id = "syndicatebotstorage"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/ruin/unpowered/syndicate_space_base/main)
 "FZ" = (
 /obj/effect/spawner/window/plastitanium,
 /turf/simulated/floor/plating,
@@ -5960,7 +5938,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/syndicate/west,
+/obj/machinery/power/apc/syndicate/directional/west,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgreen";
 	dir = 8
@@ -6045,7 +6023,7 @@
 	d2 = 2;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/syndicate/east,
+/obj/machinery/power/apc/syndicate/directional/east,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "brown"
@@ -6717,15 +6695,6 @@
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/wood,
 /area/ruin/unpowered/syndicate_space_base/service)
-"Lb" = (
-/obj/machinery/door/poddoor/multi_tile/two_tile_hor{
-	name = "Syndie Sentry Bot Storage";
-	id_tag = "syndicatebotstorage"
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/ruin/unpowered/syndicate_space_base/main)
 "Lc" = (
 /obj/machinery/computer/cryopod{
 	pixel_x = -32;
@@ -8452,7 +8421,7 @@
 	d2 = 2;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/syndicate/east,
+/obj/machinery/power/apc/syndicate/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -12301,9 +12270,9 @@ kE
 AD
 kE
 kE
-RX
-jC
-Lb
+Ox
+am
+am
 jk
 Ky
 SW
@@ -12373,10 +12342,10 @@ kE
 kE
 kE
 kE
-RX
-sX
+Ox
+am
+am
 am
-FV
 am
 wK
 am

_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm

@@ -395,7 +395,7 @@
 	animal_species = /mob/living/simple_animal/pet/dog;
 	attack_sound = 'sound/weapons/bite.ogg';
 	attacktext = "bites";
-	damage_coeff = list("brute"=1,"fire"=1,"tox"=1,"clone"=1,"stamina"=1,"oxy"=1);
+	damage_coeff = list("brute" = 1, "fire" = 1, "tox" = 1, "clone" = 1, "stamina" = 1, "oxy" = 1);
 	death_sound = null;
 	deathmessage = "";
 	desc = "This is no longer a goodboy. Not anymore. He has seen too much.";
@@ -1078,7 +1078,7 @@
 	animal_species = /mob/living/simple_animal/pet/dog;
 	attack_sound = 'sound/weapons/bite.ogg';
 	attacktext = "bites";
-	damage_coeff = list("brute"=1,"fire"=1,"tox"=1,"clone"=1,"stamina"=1,"oxy"=1);
+	damage_coeff = list("brute" = 1, "fire" = 1, "tox" = 1, "clone" = 1, "stamina" = 1, "oxy" = 1);
 	death_sound = null;
 	deathmessage = "";
 	desc = "This is no longer a goodboy. Not anymore. He has seen too much.";
@@ -1274,7 +1274,7 @@
 	animal_species = /mob/living/simple_animal/pet/dog;
 	attack_sound = 'sound/weapons/bite.ogg';
 	attacktext = "bites";
-	damage_coeff = list("brute"=1,"fire"=1,"tox"=1,"clone"=1,"stamina"=1,"oxy"=1);
+	damage_coeff = list("brute" = 1, "fire" = 1, "tox" = 1, "clone" = 1, "stamina" = 1, "oxy" = 1);
 	death_sound = null;
 	deathmessage = "";
 	desc = "This is no longer a goodboy. Not anymore. He has seen too much.";

_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm

@@ -986,11 +986,7 @@
 /area/syndicate_depot/core)
 "cJ" = (
 /obj/structure/cable,
-/obj/machinery/power/apc/off_station{
-	dir = 4;
-	pixel_x = 24;
-	req_access = list(150)
-	},
+/obj/machinery/power/apc/syndicate/directional/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -1155,10 +1151,7 @@
 	},
 /area/syndicate_depot/core)
 "de" = (
-/obj/machinery/power/apc/off_station{
-	dir = 4;
-	pixel_x = 24
-	},
+/obj/machinery/power/apc/off_station/directional/east,
 /obj/structure/cable,
 /turf/simulated/floor/plating/airless,
 /area/syndicate_depot/outer)

_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm

@@ -104,11 +104,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "w" = (
-/obj/machinery/power/apc/off_station{
-	keep_preset_name = 1;
-	name = "Outpost APC";
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/off_station/directional/south,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "x" = (

_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm

@@ -2,7 +2,7 @@
 "aa" = (
 /obj/effect/landmark/burnturf,
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="cautionfull");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/hallway/primary)
@@ -479,10 +479,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 8;
-	pixel_x = -24
-	},
+/obj/machinery/power/apc/off_station/directional/west,
 /turf/simulated/floor/wood,
 /area/ruin/space/derelict/bridge)
 "bp" = (
@@ -621,7 +618,7 @@
 /area/ruin/space/derelict/bridge)
 "bE" = (
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="dark");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "dark");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/arrival)
@@ -1535,10 +1532,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "darkred"
@@ -1704,10 +1698,7 @@
 	pixel_y = 1
 	},
 /obj/structure/musician/piano,
-/obj/machinery/power/apc/off_station{
-	dir = 1;
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/directional/north,
 /turf/simulated/floor/wood,
 /area/ruin/space/derelict/crew_quarters)
 "em" = (
@@ -1942,7 +1933,7 @@
 /area/ruin/space/derelict/hallway/primary)
 "eM" = (
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="purplefull");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "purplefull");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/hallway/primary)
@@ -2055,7 +2046,7 @@
 /area/ruin/space/derelict/hallway/primary)
 "eZ" = (
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="cautionfull");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/hallway/primary)
@@ -2734,10 +2725,7 @@
 	icon_state = "0-2";
 	pixel_y = 1
 	},
-/obj/machinery/power/apc/off_station{
-	dir = 1;
-	pixel_y = 24
-	},
+/obj/machinery/power/apc/off_station/directional/north,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "caution"
@@ -2969,7 +2957,7 @@
 	dir = 1
 	},
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="whiteredfull");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/hallway/primary)
@@ -3529,7 +3517,7 @@
 /area/ruin/space/derelict/hallway/primary)
 "iD" = (
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="engine");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "engine");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/hallway/primary)
@@ -5537,7 +5525,7 @@
 	dir = 8
 	},
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="whiteredfull");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/hallway/primary)
@@ -5707,7 +5695,7 @@
 /area/ruin/space/derelict/hallway/primary)
 "nU" = (
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="hydrofloor");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "hydrofloor");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/crew_quarters)
@@ -6194,7 +6182,7 @@
 /area/ruin/space/derelict/crew_quarters)
 "pj" = (
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="orangefull");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "orangefull");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/crew_quarters)
@@ -6566,7 +6554,7 @@
 /area/ruin/space/derelict/arrival)
 "qk" = (
 /turf/simulated/wall/mineral/titanium/nodecon/tileblend{
-	fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="redfull");
+	fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "redfull");
 	icon_state = "4-i"
 	},
 /area/ruin/space/derelict/arrival)
@@ -6757,7 +6745,7 @@
 /obj/item/trash/tapetrash,
 /obj/item/trash/pistachios,
 /obj/item/reagent_containers/syringe/charcoal{
-	list_reagents = list("charcoal"=13,"salmonella"=2)
+	list_reagents = list("charcoal" = 13, "salmonella" = 2)
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull"

_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm

@@ -165,10 +165,7 @@
 /turf/simulated/wall,
 /area/ruin/space/derelict/teleporter)
 "B" = (
-/obj/machinery/power/apc/off_station{
-	name = "Worn-out APC";
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/worn_out/directional/south,
 /turf/simulated/floor/plasteel/airless{
 	icon_state = "floorgrime"
 	},

_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm

@@ -18,7 +18,7 @@
 	},
 /area/ruin/space/unpowered)
 "ae" = (
-/turf/simulated/wall/mineral/titanium,
+/turf/simulated/wall/mineral/titanium/nodecon,
 /area/ruin/space/unpowered)
 "af" = (
 /obj/structure/computerframe,
@@ -429,7 +429,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/structure/window/reinforced,
+/obj/structure/window/plasmareinforced,
 /turf/simulated/floor/mineral/plasma,
 /area/ruin/space/unpowered)
 "bC" = (
@@ -468,14 +468,14 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/unpowered)
 "bH" = (
-/turf/simulated/wall/mineral/titanium,
+/turf/simulated/wall/mineral/titanium/nodecon,
 /area/space/nearstation)
 "bI" = (
-/obj/structure/window/reinforced,
+/obj/structure/window/plasmareinforced,
 /turf/simulated/floor/mineral/plasma,
 /area/ruin/space/unpowered)
 "bJ" = (
-/obj/structure/window/reinforced{
+/obj/structure/window/plasmareinforced{
 	dir = 4
 	},
 /turf/simulated/floor/mineral/plasma,
@@ -485,15 +485,14 @@
 /turf/space,
 /area/ruin/space/unpowered)
 "bL" = (
-/obj/structure/window/reinforced{
+/obj/structure/window/plasmareinforced{
 	dir = 8
 	},
 /turf/simulated/floor/mineral/plasma,
 /area/ruin/space/unpowered)
 "bM" = (
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
+/obj/structure/window/plasmareinforced{
+	dir = 1
 	},
 /turf/simulated/floor/mineral/plasma,
 /area/ruin/space/unpowered)

_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm

@@ -409,9 +409,7 @@
 /area/ruin/space/wreck_cargoship)
 "nH" = (
 /obj/machinery/light/small,
-/obj/machinery/power/apc/off_station/empty_charge{
-	pixel_y = -24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/directional/south,
 /turf/simulated/floor/plating,
 /area/ruin/space/wreck_cargoship)
 "oE" = (
@@ -1114,7 +1112,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 8
 	},
 /obj/structure/railing,
@@ -1208,7 +1206,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/wreck_cargoship)
 "VF" = (
-/obj/machinery/computer{
+/obj/machinery/computer/nonfunctional{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{

_maps/map_files/RandomZLevels/beach.dmm

@@ -728,7 +728,7 @@
 /turf/simulated/floor/mineral/titanium/blue,
 /area/awaymission/beach)
 "ec" = (
-/obj/machinery/computer,
+/obj/machinery/computer/nonfunctional,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/awaymission/beach)
 "ed" = (

_maps/map_files/shuttles/admin_hospital.dmm

@@ -97,7 +97,7 @@
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "aB" = (
-/obj/machinery/dna_scannernew,
+/obj/machinery/clonescanner,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "aC" = (
@@ -538,12 +538,12 @@
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "cp" = (
-/obj/machinery/suit_storage_unit/cmo/secure/sec_storage,
+/obj/machinery/suit_storage_unit/cmo/sec_storage,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "cq" = (
 /obj/machinery/light,
-/obj/machinery/suit_storage_unit/cmo/secure/sec_storage,
+/obj/machinery/suit_storage_unit/cmo/sec_storage,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "cr" = (
@@ -585,12 +585,10 @@
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "ip" = (
-/obj/machinery/clonepod{
-	biomass = 300
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/clonepod/upgraded,
 /turf/simulated/floor/mineral/titanium,
 /area/shuttle/administration)
 "kY" = (

_maps/map_files/shuttles/emergency_cyb.dmm

@@ -1013,7 +1013,7 @@ aO
 aH
 aH
 aH
-bj
+ac
 bg
 ba
 ba

_maps/map_files/templates/biodome_beach.dmm

@@ -283,7 +283,7 @@
 /turf/simulated/floor/pod,
 /area/ruin/powered/beach)
 "br" = (
-/obj/effect/baseturf_helper/lava_land/surface,
+/obj/effect/baseturf_helper/lava/mapping_lava,
 /turf/simulated/floor/beach/sand,
 /area/ruin/powered/beach)
 "bx" = (
@@ -428,9 +428,9 @@
 	dir = 4
 	},
 /turf/simulated/floor/pod/light{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/powered/beach)
 "lM" = (
@@ -546,9 +546,9 @@
 	dir = 8
 	},
 /turf/simulated/floor/pod/light{
-	nitrogen = 23;
-	oxygen = 14;
-	temperature = 300
+	nitrogen = 14;
+	oxygen = 8;
+	temperature = 500
 	},
 /area/ruin/powered/beach)
 "TW" = (

code/__DEFINES/MC.dm

@@ -34,34 +34,34 @@
 //SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier)
 
 //subsystem does not initialize.
-#define SS_NO_INIT 1
+#define SS_NO_INIT (1<<0)
 
 //subsystem does not fire.
 //	(like can_fire = 0, but keeps it from getting added to the processing subsystems list)
 //	(Requires a MC restart to change)
-#define SS_NO_FIRE 2
+#define SS_NO_FIRE (1<<1)
 
 /** Subsystem only runs on spare cpu (after all non-background subsystems have ran that tick) */
 /// SS_BACKGROUND has its own priority bracket, this overrides SS_TICKER's priority bump
-#define SS_BACKGROUND 4
+#define SS_BACKGROUND (1<<2)
 
 //subsystem does not tick check, and should not run unless there is enough time (or its running behind (unless background))
-#define SS_NO_TICK_CHECK 8
+#define SS_NO_TICK_CHECK (1<<3)
 
 //Treat wait as a tick count, not DS, run every wait ticks.
 /// (also forces it to run first in the tick (unless SS_BACKGROUND))
 //	(implies all runlevels because of how it works)
 //	This is designed for basically anything that works as a mini-mc (like SStimer)
-#define SS_TICKER 16
+#define SS_TICKER (1<<4)
 
 //keep the subsystem's timing on point by firing early if it fired late last fire because of lag
 //	ie: if a 20ds subsystem fires say 5 ds late due to lag or what not, its next fire would be in 15ds, not 20ds.
-#define SS_KEEP_TIMING 32
+#define SS_KEEP_TIMING (1<<5)
 
 //Calculate its next fire after its fired.
 //	(IE: if a 5ds wait SS takes 2ds to run, its next fire should be 5ds away, not 3ds like it normally would be)
 //	This flag overrides SS_KEEP_TIMING
-#define SS_POST_FIRE_TIMING 64
+#define SS_POST_FIRE_TIMING (1<<6)
 
 //SUBSYSTEM STATES
 #define SS_IDLE 0		//aint doing shit.

code/__DEFINES/_click.dm

@@ -0,0 +1,45 @@
+//Defines file for byond click related parameters
+//this is mostly for ease of use and for finding all the things that use say RIGHT_CLICK rather then just searching "right"
+
+//Mouse buttons held
+#define RIGHT_CLICK "right"
+#define MIDDLE_CLICK "middle"
+#define LEFT_CLICK "left"
+
+///Mouse button that was just clicked/released
+///if(modifiers[BUTTON] == LEFT_CLICK)
+#define BUTTON "button"
+
+//Keys held down during the mouse action
+#define CTRL_CLICK "ctrl"
+#define ALT_CLICK "alt"
+#define SHIFT_CLICK "shift"
+
+//Cells involved if using a Grid control
+#define DRAG_CELL "drag-cell"
+#define DROP_CELL "drop-cell"
+
+//The button used for dragging (only sent for unrelated mouse up/down messages during a drag)
+#define DRAG "drag"
+
+//If the mouse is over a link in maptext, or this event is related to clicking such a link
+#define LINK "link"
+
+//Pixel coordinates relative to the icon's position on screen
+#define VIS_X "vis-x"
+#define VIS_Y "vis-y"
+
+//Pixel coordinates within the icon, in the icon's coordinate space
+#define ICON_X "icon-x"
+#define ICON_Y "icon-y"
+
+//Pixel coordinates in screen_loc format ("[tile_x]:[pixel_x],[tile_y]:[pixel_y]")
+#define SCREEN_LOC "screen-loc"
+
+//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
+/// Objects will ignore being clicked on regardless of their transparency (used in parallax, lighting effects, holograms, lasers, etc.)
+#define MOUSE_OPACITY_TRANSPARENT 0
+/// Objects will be clicked on if it is the topmost object and the pixel isn't transparent at the position of the mouse (default behavior for 99.99% of game objects)
+#define MOUSE_OPACITY_ICON 1
+/// Objects will be always be clicked on regardless of pixel transparency or other objects at that location (used in space vines, megafauna, storage containers)
+#define MOUSE_OPACITY_OPAQUE 2

code/__DEFINES/_math.dm

@@ -28,6 +28,8 @@
 // round() acts like floor(x, 1) by default but can't handle other values
 #define FLOOR(x, y) ( round((x) / (y)) * (y) )
 
+#define ROUND_UP(x) ( -round(-(x)))
+
 // Similar to clamp but the bottom rolls around to the top and vice versa. min is inclusive, max is exclusive
 #define WRAP(val, min, max) clamp(( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ),min,max)
 

code/__DEFINES/access_defines.dm

@@ -72,6 +72,8 @@
 #define ACCESS_MINISAT 75
 #define ACCESS_MINERAL_STOREROOM 76
 #define ACCESS_NETWORK 77
+#define ACCESS_CARGO_BAY 78
+#define ACCESS_SUPPLY_SHUTTLE 79
 
 #define ACCESS_WEAPONS 99 //Weapon authorization for secbots
 

code/__DEFINES/action_button_defines.dm

@@ -0,0 +1,28 @@
+#define AB_CHECK_RESTRAINED		(1<<0)
+#define AB_CHECK_STUNNED		(1<<1)
+#define AB_CHECK_LYING			(1<<2)
+#define AB_CHECK_CONSCIOUS		(1<<3)
+#define AB_CHECK_TURF			(1<<4)
+#define AB_CHECK_HANDS_BLOCKED	(1<<5)
+#define AB_CHECK_IMMOBILE		(1<<6)
+
+#define ACTION_BUTTON_DEFAULT_BACKGROUND "_use_ui_default_background"
+
+
+//Upper left (action buttons)
+
+#define ui_action_palette "WEST+0:23,NORTH-1:3"
+#define ui_action_palette_offset(north_offset) ("WEST+0:23,NORTH-[1+north_offset]:3")
+
+#define ui_palette_scroll "WEST+1:8,NORTH-6:28"
+#define ui_palette_scroll_offset(north_offset) ("WEST+1:8,NORTH-[6+north_offset]:15")
+// Defines relating to action button positions
+
+/// Whatever the base action datum thinks is best
+#define SCRN_OBJ_DEFAULT "default"
+/// Floating somewhere on the hud, not in any predefined place
+#define SCRN_OBJ_FLOATING "floating"
+/// In the list of buttons stored at the top of the screen
+#define SCRN_OBJ_IN_LIST "list"
+/// In the collapseable palette
+#define SCRN_OBJ_IN_PALETTE "palette"

code/__DEFINES/action_defines.dm

@@ -0,0 +1,6 @@
+
+#define UPDATE_BUTTON_NAME (1<<0)
+#define UPDATE_BUTTON_ICON (1<<1)
+#define UPDATE_BUTTON_BACKGROUND (1<<2)
+#define UPDATE_BUTTON_OVERLAY (1<<3)
+#define UPDATE_BUTTON_STATUS (1<<4)

code/__DEFINES/admin_defines.dm

@@ -1,13 +1,11 @@
 //A set of constants used to determine which type of mute an admin wishes to apply:
-//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
-//Therefore there needs to be a gap between the flags for the automute flags
-#define MUTE_IC			1
-#define MUTE_OOC		2
-#define MUTE_PRAY		4
-#define MUTE_ADMINHELP	8
-#define MUTE_DEADCHAT	16
-#define MUTE_EMOTE 		32
-#define MUTE_ALL		63
+#define MUTE_IC			(1<<0)
+#define MUTE_OOC		(1<<1)
+#define MUTE_PRAY		(1<<2)
+#define MUTE_ADMINHELP	(1<<3)
+#define MUTE_DEADCHAT	(1<<4)
+#define MUTE_EMOTE 		(1<<5)
+#define MUTE_ALL		((1<<6)-1) //5 bit bitmask, update me if we ever add more mute options.
 
 //Number of identical messages required to get the spam-prevention automute thing to trigger warnings and automutes
 #define SPAM_TRIGGER_WARNING 5
@@ -24,28 +22,29 @@
 
 //Please don't edit these values without speaking to Errorage first	~Carn
 //Admin Permissions
-#define R_BUILDMODE		1
-#define R_ADMIN			2
-#define R_BAN			4
-#define R_EVENT			8
-#define R_SERVER		16
-#define R_DEBUG			32
-#define R_POSSESS		64
-#define R_PERMISSIONS	128
-#define R_STEALTH		256
-#define R_REJUVINATE	512
-#define R_VAREDIT		1024
-#define R_SOUNDS		2048
-#define R_SPAWN			4096
-#define R_MOD			8192
-#define R_MENTOR		16384
-#define R_PROCCALL		32768
-#define R_VIEWRUNTIMES	65536
-#define R_MAINTAINER	131072
+#define R_BUILDMODE		(1<<0)
+#define R_ADMIN			(1<<1)
+#define R_BAN			(1<<2)
+#define R_EVENT			(1<<3)
+#define R_SERVER		(1<<4)
+#define R_DEBUG			(1<<5)
+#define R_POSSESS		(1<<6)
+#define R_PERMISSIONS	(1<<7)
+#define R_STEALTH		(1<<8)
+#define R_REJUVINATE	(1<<9)
+#define R_VAREDIT		(1<<10)
+#define R_SOUNDS		(1<<11)
+#define R_SPAWN			(1<<12)
+#define R_MOD			(1<<13)
+#define R_MENTOR		(1<<14)
+#define R_PROCCALL		(1<<15)
+#define R_VIEWRUNTIMES	(1<<16)
+#define R_MAINTAINER	(1<<17)
+// Update the following two defines if you add more
 
-#define R_MAXPERMISSION 131072 //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
+#define R_MAXPERMISSION (1<<17) //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
 
-#define R_HOST			262143 // Sum of all permissions to allow easy setting
+#define R_HOST			((1<<18)-1) //17 bit bitmask, update me if we ever add more admin permissions. Sum of all permissions to allow easy setting.
 
 #define ADMIN_QUE(user,display) "<a href='?_src_=holder;adminmoreinfo=[user.UID()]'>[display]</a>"
 #define ADMIN_FLW(user,display) "<a href='?_src_=holder;adminplayerobservefollow=[user.UID()]'>[display]</a>"

code/__DEFINES/antag_defines.dm

@@ -1,3 +1,6 @@
+/**
+ * Contractors
+ */
 // Contract Statuses
 /// The contract is invalid for some reason and cannot be taken. It may be made valid later.
 #define CONTRACT_STATUS_INVALID -1
@@ -27,3 +30,34 @@
 
 GLOBAL_DATUM(prisoner_belongings, /obj/structure/closet/secure_closet/contractor)
 GLOBAL_LIST(contractors)
+
+/**
+ * Traitors
+ */
+#define UPLINK_SPECIAL_SPAWNING "ONE PINK CHAINSAW PLEASE"
+
+/**
+ * Changelings
+ */
+// Defines below to be used with the changeling action's `power_type` var.
+/// Denotes that this power is free and should be given to all changelings by default.
+#define CHANGELING_INNATE_POWER			1
+/// Denotes that this power can only be obtained by purchasing it.
+#define CHANGELING_PURCHASABLE_POWER	2
+/// Denotes that this power can not be obtained normally. Primarily used for base types such as [/datum/action/changeling/weapon].
+#define CHANGELING_UNOBTAINABLE_POWER	3
+
+#define CHANGELING_FAKEDEATH_TIME					50 SECONDS
+#define CHANGELING_ABSORB_RECENT_SPEECH			8	//The amount of recent spoken lines to gain on absorbing a mob
+
+/**
+ * Abductors
+ */
+
+#define ABDUCTOR_VEST_STEALTH 1
+#define ABDUCTOR_VEST_COMBAT 2
+
+/**
+ * Pulse Demon
+ */
+#define PULSEDEMON_SOURCE_DRAIN_INVALID (-1)

code/__DEFINES/apc_defines.dm

@@ -0,0 +1,28 @@
+// main_status var
+#define APC_EXTERNAL_POWER_NOTCONNECTED 0
+#define APC_EXTERNAL_POWER_NOENERGY 1
+#define APC_EXTERNAL_POWER_GOOD 2
+
+//opened
+#define APC_CLOSED 0
+#define APC_OPENED 1
+#define APC_COVER_OFF 2
+
+#define APC_AUTOFLAG_ALL_OFF 0
+#define APC_AUTOFLAG_ENVIRO_ONLY 1
+#define APC_AUTOFLAG_EQUIPMENT_OFF 2
+#define APC_AUTOFLAG_ALL_ON 3
+
+//electronics_state
+#define APC_ELECTRONICS_NONE 0
+#define APC_ELECTRONICS_INSTALLED 1
+#define APC_ELECTRONICS_SECURED 2
+
+/// Power channel is off, anything connected to it is not powered, cannot be set manually by players
+#define APC_CHANNEL_SETTING_OFF 0
+/// APC power channel Setting Off, if set while apc is "on" set apc to "off" otherwise set to "auto-off"
+#define APC_CHANNEL_SETTING_AUTO_OFF 1
+/// APC power channel setting on,
+#define APC_CHANNEL_SETTING_ON 2   //on
+// APC user setting,
+#define APC_CHANNEL_SETTING_AUTO_ON  3 //auto

code/__DEFINES/atmospherics_defines.dm

@@ -39,7 +39,7 @@
 #define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND		4		//Minimum temperature difference before group processing is suspended
 #define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER		0.5		//Minimum temperature difference before the gas temperatures are just set to be equal
 #define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION		(T20C+10)
-#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION	(T20C+200)
+#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION	(T20C+230)
 
 //HEAT TRANSFER COEFFICIENTS
 //Must be between 0 and 1. Values closer to 1 equalize temperature faster

code/__DEFINES/bio_chip_defines.dm

@@ -0,0 +1,18 @@
+/// If used, an implant will trigger when an emote is intentionally used.
+#define BIOCHIP_EMOTE_TRIGGER_INTENTIONAL (1<<0)
+/// If used, an implant will trigger when an emote is forced/unintentionally used.
+#define BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL (1<<1)
+/// If used, an implant will always trigger when the user makes an emote.
+#define BIOCHIP_EMOTE_TRIGGER_ALWAYS (BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL | BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)
+/// If used, an implant will trigger on the user's first death.
+#define BIOCHIP_TRIGGER_DEATH_ONCE (1<<2)
+/// If used, an implant will trigger any time a user dies.
+#define BIOCHIP_TRIGGER_DEATH_ANY (1<<3)
+/// If used, an implant will NOT trigger on death when a user is gibbed.
+#define BIOCHIP_TRIGGER_NOT_WHEN_GIBBED (1<<4)
+
+// Defines related to the way that the implant is activated. This is the value for implant.activated
+/// The implant is passively active (like a mindshield)
+#define BIOCHIP_ACTIVATED_PASSIVE 0
+/// The implant is activated manually by a trigger
+#define BIOCHIP_ACTIVATED_ACTIVE 1

code/__DEFINES/bots.dm

@@ -28,12 +28,12 @@
 #define BOT_EAT_TILE		19	// adding said tiles to inventory (floorbots)
 
 //Bot types
-#define SEC_BOT				1	// Secutritrons (Beepsky) and ED-209s
-#define MULE_BOT			2	// MULEbots
-#define FLOOR_BOT			4	// Floorbots
-#define CLEAN_BOT			8	// Cleanbots
-#define MED_BOT				16	// Medibots
-#define HONK_BOT			32	// Honkbots
+#define SEC_BOT				(1<<0)	// Secutritrons (Beepsky) and ED-209s
+#define MULE_BOT			(1<<1)	// MULEbots
+#define FLOOR_BOT			(1<<2)	// Floorbots
+#define CLEAN_BOT			(1<<3)	// Cleanbots
+#define MED_BOT				(1<<4)	// Medibots
+#define HONK_BOT			(1<<5)	// Honkbots
 
 //Sentience types
 #define SENTIENCE_ORGANIC 1

code/__DEFINES/chat.dm

@@ -16,6 +16,7 @@
 #define MESSAGE_TYPE_DEADCHAT "deadchat"
 #define MESSAGE_TYPE_OOC "ooc"
 #define MESSAGE_TYPE_ADMINPM "adminpm"
+#define MESSAGE_TYPE_MENTORPM "mentorpm"
 #define MESSAGE_TYPE_COMBAT "combat"
 #define MESSAGE_TYPE_ADMINCHAT "adminchat"
 #define MESSAGE_TYPE_MENTORCHAT "mentorchat"

code/__DEFINES/cloning_defines.dm

@@ -0,0 +1,13 @@
+//Defines used to pass info between the scanner and cloning console
+#define SCANNER_UNCLONEABLE_SPECIES "uncloneable"
+#define SCANNER_HUSKED "husked"
+#define SCANNER_ABSORBED "absorbed"
+#define SCANNER_NO_SOUL "soulless"
+#define SCANNER_BRAIN_ISSUE "suicide or missing brain"
+#define SCANNER_MISC "miscellanious"
+#define SCANNER_SUCCESSFUL "successful"
+
+//Defines used to make the return value of a get_cloning_cost() operation more readable
+#define BIOMASS_COST 1
+#define SANGUINE_COST 2
+#define OSSEOUS_COST 3

code/__DEFINES/clothing_defines.dm

@@ -1,13 +1,14 @@
 //Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.
-#define HIDEGLOVES		1	//APPLIES ONLY TO THE EXTERIOR SUIT!!
-#define HIDESUITSTORAGE	2	//APPLIES ONLY TO THE EXTERIOR SUIT!!
-#define HIDEJUMPSUIT	4	//APPLIES ONLY TO THE EXTERIOR SUIT!!
-#define HIDESHOES		8	//APPLIES ONLY TO THE EXTERIOR SUIT!!
-#define HIDETAIL 		16	//APPLIES ONLY TO THE EXTERIOR SUIT!!
-#define HIDEMASK	1	//APPLIES ONLY TO HELMETS/MASKS!!
-#define HIDEEARS	2	//APPLIES ONLY TO HELMETS/MASKS!! (ears means headsets and such)
-#define HIDEEYES	4	//APPLIES ONLY TO HELMETS/MASKS!! (eyes means glasses)
-#define HIDEFACE	8	//APPLIES ONLY TO HELMETS/MASKS!! Dictates whether we appear as unknown.
+#define HIDEGLOVES		(1<<0)	//APPLIES ONLY TO THE EXTERIOR SUIT!!
+#define HIDESUITSTORAGE	(1<<1)	//APPLIES ONLY TO THE EXTERIOR SUIT!!
+#define HIDEJUMPSUIT	(1<<2)	//APPLIES ONLY TO THE EXTERIOR SUIT!!
+#define HIDESHOES		(1<<3)	//APPLIES ONLY TO THE EXTERIOR SUIT!!
+#define HIDETAIL 		(1<<4)	//APPLIES ONLY TO THE EXTERIOR SUIT!!
+
+#define HIDEMASK	(1<<0)	//APPLIES ONLY TO HELMETS/MASKS!!
+#define HIDEEARS	(1<<1)	//APPLIES ONLY TO HELMETS/MASKS!! (ears means headsets and such)
+#define HIDEEYES	(1<<2)	//APPLIES ONLY TO HELMETS/MASKS!! (eyes means glasses)
+#define HIDEFACE	(1<<3)	//APPLIES ONLY TO HELMETS/MASKS!! Dictates whether we appear as unknown.
 
 // Slot defines for var/list/inv_slots, some of these dont really show up on the HUD,
 // but still function like it in other ways. I know thats weird, and I hate it too.
@@ -46,24 +47,24 @@
 //Cant seem to find a mob bitflags area other than the powers one
 
 // bitflags for clothing parts
-#define HEAD			1
-#define UPPER_TORSO		2
-#define LOWER_TORSO		4
-#define LEG_LEFT		8
-#define LEG_RIGHT		16
-#define LEGS			24
-#define FOOT_LEFT		32
-#define FOOT_RIGHT		64
-#define FEET			96
-#define ARM_LEFT		128
-#define ARM_RIGHT		256
-#define ARMS			384
-#define HAND_LEFT		512
-#define HAND_RIGHT		1024
-#define HANDS			1536
-#define FULL_BODY		2047
+#define HEAD			(1<<0)
+#define UPPER_TORSO		(1<<1)
+#define LOWER_TORSO		(1<<2)
+#define LEG_LEFT		(1<<3)
+#define LEG_RIGHT		(1<<4)
+#define LEGS			(LEG_LEFT | LEG_RIGHT)
+#define FOOT_LEFT		(1<<5)
+#define FOOT_RIGHT		(1<<6)
+#define FEET			(FOOT_LEFT | FOOT_RIGHT)
+#define ARM_LEFT		(1<<7)
+#define ARM_RIGHT		(1<<8)
+#define ARMS			(ARM_LEFT | ARM_RIGHT)
+#define HAND_LEFT		(1<<9)
+#define HAND_RIGHT		(1<<10)
+#define HANDS			(HAND_LEFT | HAND_RIGHT)
+#define FULL_BODY		((1<<11)-1) //10 bit bitmask, update me if we ever add more clothing parts.
 
-// bitflags for the percentual amount of protection a piece of clothing which covers the body part offers.
+// the percentual amount of protection a piece of clothing which covers the body part offers.
 // Used with human/proc/get_heat_protection() and human/proc/get_cold_protection()
 // The values here should add up to 1.
 // Hands and feet have 2.5%, arms and legs 7.5%, each of the torso parts has 15% and the head has 30%
@@ -80,11 +81,11 @@
 #define THERMAL_PROTECTION_HAND_RIGHT	0.025
 
 //flags for covering body parts
-#define GLASSESCOVERSEYES	1
-#define MASKCOVERSEYES		2		// get rid of some of the other mess in these flags
-#define HEADCOVERSEYES		4		// feel free to realloc these numbers for other purposes
-#define MASKCOVERSMOUTH		8		// on other items, these are just for mask/head
-#define HEADCOVERSMOUTH		16
+#define GLASSESCOVERSEYES	(1<<0)
+#define MASKCOVERSEYES		(1<<1)		// get rid of some of the other mess in these flags
+#define HEADCOVERSEYES		(1<<2)		// feel free to realloc these numbers for other purposes
+#define MASKCOVERSMOUTH		(1<<3)		// on other items, these are just for mask/head
+#define HEADCOVERSMOUTH		(1<<4)
 
 // Suit sensor levels
 #define SUIT_SENSOR_OFF 0

code/__DEFINES/combat_defines.dm

@@ -36,20 +36,21 @@
 #define SECONDS_TO_JITTER SECONDS_TO_LIFE_CYCLES*3
 
 //I hate adding defines like this but I'd much rather deal with bitflags than lists and string searches
-#define BRUTELOSS 1
-#define FIRELOSS 2
-#define TOXLOSS 4
-#define OXYLOSS 8
-#define SHAME 16
-#define OBLITERATION 32
+#define BRUTELOSS		(1<<0)
+#define FIRELOSS		(1<<1)
+#define TOXLOSS			(1<<2)
+#define OXYLOSS			(1<<3)
+/// Stam crits the effected mob, as well as ensures they dont die from suicide
+#define SHAME 			(1<<4)
+#define OBLITERATION 	(1<<5)
 
 //Bitflags defining which status effects could be or are inflicted on a mob
-#define CANSTUN			1
-#define CANWEAKEN		2
-#define CANPARALYSE		4
-#define CANPUSH			8
-#define PASSEMOTES		16 //Mob has holders inside of it that need to see emotes.
-#define GODMODE			32
+#define CANSTUN			(1<<0)
+#define CANWEAKEN		(1<<1)
+#define CANPARALYSE		(1<<2)
+#define CANPUSH			(1<<3)
+#define PASSEMOTES		(1<<4) //Mob has holders inside of it that need to see emotes.
+#define GODMODE			(1<<5)
 
 //Health Defines
 #define HEALTH_THRESHOLD_CRIT 0

code/__DEFINES/cult_defines.dm

@@ -10,7 +10,7 @@
 #define RUNE_COLOR_EMP "#4D94FF"
 #define RUNE_COLOR_SUMMON "#00FF00"
 
-#define is_sacrifice_target(A) SSticker.mode?.cult_objs.is_sac_target(A)
+#define IS_SACRIFICE_TARGET(A) SSticker?.mode?.cult_team?.is_sac_target(A)
 
 // Blood magic
 /// Maximum number of spells with an empowering rune
@@ -42,9 +42,6 @@
 #define DEFAULT_TOOLTIP "6:-29,5:-2"
 
 // Text
-#define CULT_GREETING "<span class='cultlarge'>You catch a glimpse of the Realm of [SSticker.cultdat.entity_name], [SSticker.cultdat.entity_title3]. \
-						You now see how flimsy the world is, you see that it should be open to the knowledge of [SSticker.cultdat.entity_name].</span>"
-
 #define CULT_CURSES list("A fuel technician just slit his own throat and begged for death.",                                           \
 			"The shuttle's navigation programming was replaced by a file containing two words, IT COMES.",                             \
 			"The shuttle's custodian tore out his guts and began painting strange shapes on the floor.",                               \
@@ -66,3 +63,9 @@
 #define NARSIE_NEEDS_SUMMONING 2
 #define NARSIE_HAS_RISEN 3
 #define NARSIE_HAS_FALLEN -1
+
+/// Safely accesses SSticker.cult_data, returns the default if cult data is not set up yet. Allows for both variable and proc call access.
+#define GET_CULT_DATA(var_or_proc, default) (SSticker.cult_data ? SSticker.cult_data.var_or_proc : default)
+
+/// Checks that the given element is living an has a cult antag datum
+#define IS_CULTIST(mob) (isliving(mob) && mob?:mind?:has_antag_datum(/datum/antagonist/cultist)) // for someone TODO, move all antag checks over to TG's `IS_TRAITOR` defines. Also remove `isliving()` from this call someday

code/__DEFINES/dcs/signals.dm

@@ -157,9 +157,6 @@
 ///from base of datum/radiation_wave/check_obstructions(): (datum/radiation_wave, width)
 #define COMSIG_ATOM_RAD_WAVE_PASSING "atom_rad_wave_pass"
 	#define COMPONENT_RAD_WAVE_HANDLED (1<<0)
-///from internal loop in atom/movable/proc/CanReach(): (list/next)
-#define COMSIG_ATOM_CANREACH "atom_can_reach"
-	#define COMPONENT_BLOCK_REACH (1<<0)
 ///from base of atom/screwdriver_act(): (mob/living/user, obj/item/I)
 #define COMSIG_ATOM_SCREWDRIVER_ACT "atom_screwdriver_act"
 ///from base of atom/wrench_act(): (mob/living/user, obj/item/I)
@@ -188,6 +185,10 @@
 #define COMSIG_ATOM_HITBY "atom_hitby"
 /// Called when an atom is sharpened or dulled.
 #define COMSIG_ATOM_UPDATE_SHARPNESS "atom_update_sharpness"
+///from base of atom/atom_prehit(obj/item/projectile/P):
+#define COMSIG_ATOM_PREHIT "atom_prehit"
+	#define ATOM_PREHIT_SUCCESS (1<<0)
+	#define ATOM_PREHIT_FAILURE (1<<1)
 
 // Attack signals. These should share the returned flags, to standardize the attack chain.
 // The chain currently works like:
@@ -218,6 +219,9 @@
 
 /////////////////
 
+///from base of client/Click(): (atom/target, atom/location, control, params, mob/user)
+#define COMSIG_CLIENT_CLICK "atom_client_click"
+
 ///from base of area/Entered(): (/area)
 #define COMSIG_ENTER_AREA "enter_area"
 ///from base of area/Exited(): (/area)
@@ -777,6 +781,9 @@
 #define COMSIG_HUMAN_CHECK_SHIELDS "human_check_shields"
 	#define SHIELD_BLOCK (1<<0)
 
+///from /mob/living/carbon/human/create_mob_hud()
+#define COMSIG_HUMAN_CREATE_MOB_HUD "human_create_mob_hud"
+
 // /datum/species signals
 
 ///from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)
@@ -920,6 +927,10 @@
 #define COMSIG_ACTION_TRIGGER "action_trigger"
 	#define COMPONENT_ACTION_BLOCK_TRIGGER (1<<0)
 
+// Note that this is only defined for actions because this could be a good bit expensive otherwise
+/// From base of /atom/movable/screen/movable/action_button/MouseWheel(src, delta_x, delta_y, location, control, params)
+#define COMSIG_ACTION_SCROLLED "action_scrolled"
+
 //Xenobio hotkeys
 
 ///from slime CtrlClickOn(): (/mob)
@@ -948,7 +959,7 @@
 #define COMSIG_AIRLOCK_CLOSE "airlock_close"
 
 // /datum/objective signals
-///from datum/objective/proc/find_target()
+///from datum/objective/proc/find_target(list/target_blacklist)
 #define COMSIG_OBJECTIVE_TARGET_FOUND "objective_target_found"
 ///from datum/objective/is_invalid_target()
 #define COMSIG_OBJECTIVE_CHECK_VALID_TARGET "objective_check_valid_target"

code/__DEFINES/economy_defines.dm

@@ -60,6 +60,7 @@
 #define SUPPLY_MATERIALS 	7
 #define SUPPLY_MISC 		8
 #define SUPPLY_VEND 		9
+#define SUPPLY_SHUTTLE		10
 
 #define DEFAULT_CRATE_VALUE 15
 

code/__DEFINES/economy_event_defines.dm

@@ -0,0 +1,49 @@
+/**
+ * Random stories for newscasters
+ */
+#define RANDOM_STORY_RIOTS 1
+#define RANDOM_STORY_WILD_ANIMAL_ATTACK 2
+#define RANDOM_STORY_INDUSTRIAL_ACCIDENT 3
+#define RANDOM_STORY_BIOHAZARD_OUTBREAK 4
+#define RANDOM_STORY_WARSHIPS_ARRIVE 5
+#define RANDOM_STORY_PIRATES 6
+#define RANDOM_STORY_CORPORATE_ATTACK 7
+#define RANDOM_STORY_ALIEN_RAIDERS 8
+#define RANDOM_STORY_AI_LIBERATION 9
+#define RANDOM_STORY_MOURNING 10
+#define RANDOM_STORY_CULT_CELL_REVEALED 11
+#define RANDOM_STORY_SECURITY_BREACH 12
+#define RANDOM_STORY_ANIMAL_RIGHTS_RAID 13
+#define RANDOM_STORY_FESTIVAL 14
+#define RANDOM_STORY_RESEARCH_BREAKTHROUGH 15
+#define RANDOM_STORY_BARGAINS 16
+#define RANDOM_STORY_SONG_DEBUT 17
+#define RANDOM_STORY_MOVIE_RELEASE 18
+#define RANDOM_STORY_BIG_GAME_HUNTERS 19
+#define RANDOM_STORY_ELECTION 20
+#define RANDOM_STORY_GOSSIP 21
+#define RANDOM_STORY_TOURISM 22
+#define RANDOM_STORY_CELEBRITY_DEATH 23
+#define RANDOM_STORY_RESIGNATION 24
+
+/**
+ * Trade goods for trade destinations
+ */
+#define TRADE_GOOD_DEFAULT 1
+
+#define TRADE_GOOD_ADMINISTRATIVE 2
+#define TRADE_GOOD_CLOTHING 3
+#define TRADE_GOOD_SECURITY 4
+#define TRADE_GOOD_SPECIAL_SECURITY 5
+
+#define TRADE_GOOD_FOOD 6
+#define TRADE_GOOD_ANIMALS 7
+
+#define TRADE_GOOD_MINERALS 8
+
+#define TRADE_GOOD_EMERGENCY 9
+#define TRADE_GOOD_EGAS 10
+#define TRADE_GOOD_MAINTENANCE 11
+#define TRADE_GOOD_ELECTRICAL 12
+#define TRADE_GOOD_ROBOTICS 13
+#define TRADE_GOOD_BIOMEDICAL 14

code/__DEFINES/flags.dm

@@ -2,85 +2,81 @@
 #define NONE 0
 
 //FLAGS BITMASK
-#define STOPSPRESSUREDMAGE		1		//This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_FLAG_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag.
-#define NODROP					2		// This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
-#define NOBLUDGEON  			4		// when an item has this it produces no "X has been hit by Y with Z" message with the default handler
-#define AIRTIGHT				8		// mask allows internals
-#define HANDSLOW				16		// If an item has this flag, it will slow you to carry it
-#define CONDUCT					32		// conducts electricity (metal etc.)
-#define ABSTRACT				64		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
-#define ON_BORDER				128		// item has priority to check when entering or leaving
-#define PREVENT_CLICK_UNDER		256
-#define NODECONSTRUCT			512
+#define STOPSPRESSUREDMAGE		(1<<0)		//This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage. Note that the flag 1 was previous used as ONBACK, so it is possible for some code to use (flags & 1) when checking if something can be put on your back. Replace this code with (inv_flags & SLOT_FLAG_BACK) if you see it anywhere To successfully stop you taking all pressure damage you must have both a suit and head item with this flag.
+#define NODROP					(1<<1)		// This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
+#define NOBLUDGEON  			(1<<2)		// when an item has this it produces no "X has been hit by Y with Z" message with the default handler
+#define AIRTIGHT				(1<<3)		// mask allows internals
+#define HANDSLOW				(1<<4)		// If an item has this flag, it will slow you to carry it
+#define CONDUCT					(1<<5)		// conducts electricity (metal etc.)
+#define ABSTRACT				(1<<6)		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
+#define ON_BORDER				(1<<7)		// item has priority to check when entering or leaving
+#define PREVENT_CLICK_UNDER		(1<<8)
+#define NODECONSTRUCT			(1<<9)
+#define EARBANGPROTECT			(1<<10)
+#define HEADBANGPROTECT			(1<<11)
 
-#define EARBANGPROTECT			1024
+#define BLOCK_GAS_SMOKE_EFFECT	(1<<12)	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
+#define THICKMATERIAL 			(1<<12)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT)
 
-#define NOSLIP					1024 	//prevents from slipping on wet floors, in space etc
-
-#define HEADBANGPROTECT			4096
-
-#define BLOCK_GAS_SMOKE_EFFECT	8192	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
-#define THICKMATERIAL 			8192	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT)
-
-#define DROPDEL					16384	// When dropped, it calls qdel on itself
+#define DROPDEL					(1<<13)	// When dropped, it calls qdel on itself
 
 ///Whether or not this atom shows screentips when hovered over
-#define NO_SCREENTIPS			32768
+#define NO_SCREENTIPS			(1<<14)
 
 // Update flags for [/atom/proc/update_appearance]
 /// Update the atom's name
-#define UPDATE_NAME (1<<0)
+#define UPDATE_NAME			(1<<0)
 /// Update the atom's desc
-#define UPDATE_DESC (1<<1)
+#define UPDATE_DESC			(1<<1)
 /// Update the atom's icon state
-#define UPDATE_ICON_STATE (1<<2)
+#define UPDATE_ICON_STATE	(1<<2)
 /// Update the atom's overlays
-#define UPDATE_OVERLAYS (1<<3)
+#define UPDATE_OVERLAYS		(1<<3)
 /// Update the atom's icon
-#define UPDATE_ICON (UPDATE_ICON_STATE|UPDATE_OVERLAYS)
+#define UPDATE_ICON			(UPDATE_ICON_STATE|UPDATE_OVERLAYS)
 
 /* Secondary atom flags, for the flags_2 var, denoted with a _2 */
 
-#define SLOWS_WHILE_IN_HAND_2	1
-#define NO_EMP_WIRES_2			2
-#define HOLOGRAM_2				4
-#define FROZEN_2				8
-#define STATIONLOVING_2			16
-#define INFORM_ADMINS_ON_RELOCATE_2	32
-#define BANG_PROTECT_2			64
-#define BLOCKS_LIGHT_2          128 // Light sources placed in anything with that flag will not emit light through them.
+#define SLOWS_WHILE_IN_HAND_2		(1<<0)
+#define NO_EMP_WIRES_2				(1<<1)
+#define HOLOGRAM_2					(1<<2)
+#define FROZEN_2					(1<<3)
+#define STATIONLOVING_2				(1<<4)
+#define INFORM_ADMINS_ON_RELOCATE_2	(1<<5)
+#define BANG_PROTECT_2				(1<<6)
+#define BLOCKS_LIGHT_2				(1<<7) // Light sources placed in anything with that flag will not emit light through them.
 
 // A mob with OMNITONGUE has no restriction in the ability to speak
 // languages that they know. So even if they wouldn't normally be able to
 // through mob or tongue restrictions, this flag allows them to ignore
 // those restrictions.
-#define OMNITONGUE_2			256
+#define OMNITONGUE_2			(1<<8)
 
 /// Prevents mobs from getting chainshocked by teslas and the supermatter
-#define SHOCKED_2 				512
+#define SHOCKED_2				(1<<9)
 
 // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
-#define NO_MAT_REDEMPTION_2		1024
+#define NO_MAT_REDEMPTION_2		(1<<10)
 
 // LAVA_PROTECT used on the flags_2 variable for both SUIT and HEAD items, and stops lava damage. Must be present in both to stop lava damage.
-#define LAVA_PROTECT_2			2048
+#define LAVA_PROTECT_2			(1<<11)
 
-#define OVERLAY_QUEUED_2		4096
+#define OVERLAY_QUEUED_2		(1<<12)
 
-#define CHECK_RICOCHET_2		8192
+#define CHECK_RICOCHET_2		(1<<13)
 
 /// should the contents of this atom be acted upon
-#define RAD_PROTECT_CONTENTS_2	16384
+#define RAD_PROTECT_CONTENTS_2	(1<<14)
 /// should this object be allowed to be contaminated
-#define RAD_NO_CONTAMINATE_2	32768
+#define RAD_NO_CONTAMINATE_2	(1<<15)
 /// Prevents shuttles from deleting the item
-#define IMMUNE_TO_SHUTTLECRUSH_2 (1<<16)
+#define IMMUNE_TO_SHUTTLECRUSH_2 	(1<<16)
 /// Prevents malf AI animate + overload ability
-#define NO_MALF_EFFECT_2		(1<<17)
+#define NO_MALF_EFFECT_2			(1<<17)
 /// Use when this shouldn't be obscured by large icons.
-#define CRITICAL_ATOM_2			(1<<18)
+#define CRITICAL_ATOM_2				(1<<18)
 /// Use this flag for items that can block randomly
-#define RANDOM_BLOCKER_2		(1<<19)
+#define RANDOM_BLOCKER_2			(1<<19)
 /// This flag allows for wearing of a belt item, even if you're not wearing a jumpsuit
 #define ALLOW_BELT_NO_JUMPSUIT_2	(1<<20)
 
@@ -88,45 +84,45 @@
 #define REAGENT_NOREACT			1
 
 //Species clothing flags
-#define HAS_UNDERWEAR 	1
-#define HAS_UNDERSHIRT 	2
-#define HAS_SOCKS		4
+#define HAS_UNDERWEAR	(1<<0)
+#define HAS_UNDERSHIRT	(1<<1)
+#define HAS_SOCKS		(1<<2)
 
 //Species Body Flags
-#define HAS_HEAD_ACCESSORY	1
-#define HAS_TAIL 			2
-#define TAIL_OVERLAPPED		4
-#define HAS_SKIN_TONE 		8
-#define HAS_ICON_SKIN_TONE	16
-#define HAS_SKIN_COLOR		32
-#define HAS_HEAD_MARKINGS	64
-#define HAS_BODY_MARKINGS	128
-#define HAS_TAIL_MARKINGS	256
-#define TAIL_WAGGING    	512
-#define NO_EYES				1024
-#define HAS_ALT_HEADS		2048
-#define HAS_WING			4096
-#define HAS_BODYACC_COLOR	8192
-#define BALD				16384
-#define ALL_RPARTS			32768
-#define SHAVED				65536
+#define HAS_HEAD_ACCESSORY	(1<<0)
+#define HAS_TAIL 			(1<<1)
+#define TAIL_OVERLAPPED		(1<<2)
+#define HAS_SKIN_TONE 		(1<<3)
+#define HAS_ICON_SKIN_TONE	(1<<4)
+#define HAS_SKIN_COLOR		(1<<5)
+#define HAS_HEAD_MARKINGS	(1<<6)
+#define HAS_BODY_MARKINGS	(1<<7)
+#define HAS_TAIL_MARKINGS	(1<<8)
+#define TAIL_WAGGING    	(1<<9)
+#define NO_EYES				(1<<10)
+#define HAS_ALT_HEADS		(1<<11)
+#define HAS_WING			(1<<12)
+#define HAS_BODYACC_COLOR	(1<<13)
+#define BALD				(1<<14)
+#define ALL_RPARTS			(1<<15)
+#define SHAVED				(1<<16)
 
 //Pre-baked combinations of the above body flags
-#define HAS_BODY_ACCESSORY 	HAS_TAIL|HAS_WING
-#define HAS_MARKINGS		HAS_HEAD_MARKINGS|HAS_BODY_MARKINGS|HAS_TAIL_MARKINGS
+#define HAS_BODY_ACCESSORY 	(HAS_TAIL | HAS_WING)
+#define HAS_MARKINGS		(HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS | HAS_TAIL_MARKINGS)
 
 //Species Diet Flags
-#define DIET_CARN		1
-#define DIET_OMNI		2
-#define DIET_HERB		4
+#define DIET_CARN		(1<<0)
+#define DIET_OMNI		(1<<1)
+#define DIET_HERB		(1<<2)
 
 
 //bitflags for door switches.
-#define OPEN	1
-#define IDSCAN	2
-#define BOLTS	4
-#define SHOCK	8
-#define SAFE	16
+#define OPEN	(1<<0)
+#define IDSCAN	(1<<1)
+#define BOLTS	(1<<2)
+#define SHOCK	(1<<3)
+#define SAFE	(1<<4)
 
 //flags for pass_flags
 #define PASSTABLE		(1<<0)
@@ -140,20 +136,20 @@
 #define PASSGIRDER		(1<<8)
 
 //turf-only flags
-#define NOJAUNT		1
-#define NO_LAVA_GEN	2 //Blocks lava rivers being generated on the turf
-#define NO_RUINS 	4
+#define NOJAUNT		(1<<0)
+#define NO_LAVA_GEN	(1<<1) //Blocks lava rivers being generated on the turf
+#define NO_RUINS 	(1<<2)
 
 //ITEM INVENTORY SLOT BITMASKS
 #define SLOT_FLAG_OCLOTHING	(1<<0)
 #define SLOT_FLAG_ICLOTHING	(1<<1)
-#define SLOT_FLAG_GLOVES		(1<<2)
+#define SLOT_FLAG_GLOVES	(1<<2)
 #define SLOT_FLAG_EYES		(1<<3)
 #define SLOT_FLAG_EARS		(1<<4)
 #define SLOT_FLAG_MASK		(1<<5)
 #define SLOT_FLAG_HEAD		(1<<6)
 #define SLOT_FLAG_FEET		(1<<7)
-#define SLOT_FLAG_ID			(1<<8)
+#define SLOT_FLAG_ID		(1<<8)
 #define SLOT_FLAG_BELT		(1<<9)
 #define SLOT_FLAG_BACK		(1<<10)
 #define SLOT_FLAG_POCKET 	(1<<11)	//this is to allow items with a w_class of 3 or 4 to fit in pockets.
@@ -164,7 +160,7 @@
 //ORGAN TYPE FLAGS
 #define AFFECT_ROBOTIC_ORGAN	1
 #define AFFECT_ORGANIC_ORGAN	2
-#define AFFECT_ALL_ORGANS		3
+#define AFFECT_ALL_ORGANS	3
 
 //Fire and Acid stuff, for resistance_flags
 #define LAVA_PROOF		(1<<0)
@@ -177,29 +173,29 @@
 #define FREEZE_PROOF	(1<<7) //can't be frozen
 
 //tesla_zap
-#define ZAP_MACHINE_EXPLOSIVE		(1<<0)
-#define ZAP_ALLOW_DUPLICATES		(1<<1)
-#define ZAP_OBJ_DAMAGE				(1<<2)
-#define ZAP_MOB_DAMAGE				(1<<3)
-#define ZAP_MOB_STUN				(1<<4)
-#define ZAP_GENERATES_POWER			(1<<5)
+#define ZAP_MACHINE_EXPLOSIVE	(1<<0)
+#define ZAP_ALLOW_DUPLICATES	(1<<1)
+#define ZAP_OBJ_DAMAGE			(1<<2)
+#define ZAP_MOB_DAMAGE			(1<<3)
+#define ZAP_MOB_STUN			(1<<4)
+#define ZAP_GENERATES_POWER		(1<<5)
 
-#define ZAP_DEFAULT_FLAGS ZAP_MOB_STUN | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE
-#define ZAP_FUSION_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN
-#define ZAP_SUPERMATTER_FLAGS ZAP_GENERATES_POWER
+#define ZAP_DEFAULT_FLAGS (ZAP_MOB_STUN | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE)
+#define ZAP_FUSION_FLAGS (ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN)
+#define ZAP_SUPERMATTER_FLAGS (ZAP_GENERATES_POWER)
 
 GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
 
 //Mob mobility var flags
 /// can move
-#define MOBILITY_MOVE (1<<0)
+#define MOBILITY_MOVE	(1<<0)
 /// can, and is, standing up
-#define MOBILITY_STAND (1<<1)
+#define MOBILITY_STAND	(1<<1)
 /// can pickup items
-#define MOBILITY_PICKUP (1<<2)
+#define MOBILITY_PICKUP	(1<<2)
 /// can hold and use items
-#define MOBILITY_USE (1<<3)
+#define MOBILITY_USE	(1<<3)
 /// can pull things
-#define MOBILITY_PULL (1<<4)
+#define MOBILITY_PULL	(1<<4)
 
 #define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_PULL)

code/__DEFINES/gamemode.dm

@@ -1,15 +1,17 @@
 //objective defines
-#define TARGET_INVALID_IS_OWNER		1
-#define TARGET_INVALID_NOT_HUMAN	2
-#define TARGET_INVALID_DEAD			3
-#define TARGET_INVALID_NOCKEY		4
-#define TARGET_INVALID_UNREACHABLE	5
-#define TARGET_INVALID_GOLEM		6
-#define TARGET_INVALID_EVENT		7
-#define TARGET_INVALID_IS_TARGET	8
-#define TARGET_INVALID_BLACKLISTED	9
-#define TARGET_INVALID_CHANGELING	10
-#define TARGET_INVALID_NOTHEAD		11
+#define TARGET_INVALID_IS_OWNER			1
+#define TARGET_INVALID_NOT_HUMAN		2
+#define TARGET_INVALID_DEAD				3
+#define TARGET_INVALID_NOCKEY			4
+#define TARGET_INVALID_UNREACHABLE		5
+#define TARGET_INVALID_GOLEM			6
+#define TARGET_INVALID_EVENT			7
+#define TARGET_INVALID_IS_TARGET		8
+#define TARGET_INVALID_BLACKLISTED		9
+#define TARGET_INVALID_CHANGELING		10
+#define TARGET_INVALID_NOTHEAD			11
+#define TARGET_INVALID_CULTIST			12
+#define TARGET_INVALID_CULT_CONVERTABLE	13
 
 //gamemode istype helpers
 #define GAMEMODE_IS_CULT		(SSticker && istype(SSticker.mode, /datum/game_mode/cult))

code/__DEFINES/genetics_defines.dm

@@ -5,21 +5,19 @@
 
 #define MUTCHK_FORCED        1
 
-// mob/var/list/mutations
-
 // Used in preferences.
-#define DISABILITY_FLAG_NEARSIGHTED 1
-#define DISABILITY_FLAG_FAT         2
-#define DISABILITY_FLAG_BLIND       4
-#define DISABILITY_FLAG_MUTE        8
-#define DISABILITY_FLAG_COLOURBLIND 16
-#define DISABILITY_FLAG_WINGDINGS   32
-#define DISABILITY_FLAG_NERVOUS     64
-#define DISABILITY_FLAG_SWEDISH     128
-#define DISABILITY_FLAG_LISP        256
-#define DISABILITY_FLAG_DIZZY       512
-#define DISABILITY_FLAG_CHAV        1024
-#define DISABILITY_FLAG_DEAF        2048
+#define DISABILITY_FLAG_NEARSIGHTED (1<<0)
+#define DISABILITY_FLAG_FAT         (1<<1)
+#define DISABILITY_FLAG_BLIND       (1<<2)
+#define DISABILITY_FLAG_MUTE        (1<<3)
+#define DISABILITY_FLAG_COLOURBLIND (1<<4)
+#define DISABILITY_FLAG_WINGDINGS   (1<<5)
+#define DISABILITY_FLAG_NERVOUS     (1<<6)
+#define DISABILITY_FLAG_SWEDISH     (1<<7)
+#define DISABILITY_FLAG_LISP        (1<<8)
+#define DISABILITY_FLAG_DIZZY       (1<<9)
+#define DISABILITY_FLAG_CHAV        (1<<10)
+#define DISABILITY_FLAG_DEAF        (1<<11)
 
 ///////////////////////////////////////
 // MUTATIONS

code/__DEFINES/hud.dm

@@ -70,3 +70,30 @@
 #define EXAMINE_HUD_MEDICAL_READ "medical_read"
 #define EXAMINE_HUD_MEDICAL_WRITE "medical_write"
 #define EXAMINE_HUD_SKILLS "skills"
+
+/proc/ui_hand_position(i)
+	// values based on old hand ui positions (CENTER:-/+16,SOUTH:5)
+	var/x_off = i % 2 ? 0 : -1
+	var/y_off = round((i-1) / 2)
+	return"CENTER+[x_off]:16,SOUTH+[y_off]:5"
+
+/proc/ui_equip_position(mob/M)
+	// values based on old equip ui position (CENTER: +/-16,SOUTH+1:5)
+	var/y_off = round(1 / 2)
+	return "CENTER:-16,SOUTH+[y_off+1]:5"
+
+/proc/ui_swaphand_position(mob/M, which = 1)
+	// values based on old swaphand ui positions (CENTER: +/-16,SOUTH+1:5)
+	var/x_off = which == 1 ? -1 : 0
+	var/y_off = round(1 / 2)
+	return "CENTER+[x_off]:16,SOUTH+[y_off+1]:5"
+
+
+/// Takes a string or num view, and converts it to pixel width/height in a list(pixel_width, pixel_height)
+/proc/view_to_pixels(view)
+	if(!view)
+		return list(0, 0)
+	var/list/view_info = getviewsize(view)
+	view_info[1] *= world.icon_size
+	view_info[2] *= world.icon_size
+	return view_info

code/__DEFINES/inventory_defines.dm

@@ -5,3 +5,8 @@
 #define WEIGHT_CLASS_BULKY    4 //Items that can be weilded or equipped but not stored in an inventory, ex: Defibrillator, Backpack, Space Suits
 #define WEIGHT_CLASS_HUGE     5 //Usually represents objects that require two hands to operate, ex: Shotgun, Two Handed Melee Weapons
 #define WEIGHT_CLASS_GIGANTIC 6 //Essentially means it cannot be picked up or placed in an inventory, ex: Mech Parts, Safe
+
+//Inventory depth: limits how many nested storage items you can access directly.
+//1: stuff in mob, 2: stuff in backpack, 3: stuff in box in backpack, etc
+#define INVENTORY_DEPTH 3
+#define STORAGE_VIEW_DEPTH 2

code/__DEFINES/is_helpers.dm

@@ -27,6 +27,8 @@
 
 #define isaliensentinel(A) (istype(A, /mob/living/carbon/alien/humanoid/sentinel))
 
+#define isalienqueen(A) (istype(A, /mob/living/carbon/alien/humanoid/queen))
+
 // Simple animals
 
 #define issimple_animal(A) (istype(A, /mob/living/simple_animal))
@@ -114,6 +116,9 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
 // Structures
 #define isstructure(A)	(istype((A), /obj/structure))
 
+// Vehicles
+#define isvehicle(A) istype(A, /obj/vehicle)
+
 // Misc
 #define isclient(A) istype(A, /client)
 #define isradio(A) istype(A, /obj/item/radio)
@@ -131,3 +136,5 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list(
 )))
 
 #define ispassmeteorturf(A) (is_type_in_typecache(A, GLOB.turfs_pass_meteor))
+
+#define is_screen_atom(A) istype(A, /atom/movable/screen)

code/__DEFINES/keybindings_defines.dm

@@ -14,6 +14,8 @@
 #define KB_CATEGORY_EMOTE_SILICON	14
 #define KB_CATEGORY_EMOTE_ANIMAL	15
 #define KB_CATEGORY_EMOTE_CUSTOM	16
+#define KB_CATEGORY_CLICK			17
+#define KB_CATEGORY_COMMUNICATION	18
 #define KB_CATEGORY_UNSORTED		1000
 
 ///Max length of a keypress command before it's considered to be a forged packet/bogus command

code/__DEFINES/layers.dm

@@ -94,7 +94,8 @@
 #define HIGH_LANDMARK_LAYER 9.2
 #define AREA_LAYER 10
 #define MASSIVE_OBJ_LAYER 11
-#define POINT_LAYER 12
+#define SMOKE_PLANE 12
+#define POINT_LAYER 13
 
 #define CHAT_LAYER 12.0001 // Do not insert layers between these two values
 #define CHAT_LAYER_MAX 12.9999

code/__DEFINES/machines.dm

@@ -1,13 +1,13 @@
-#define	IMPRINTER		1	//For circuits. Uses glass/chemicals.
-#define PROTOLATHE		2	//New stuff. Uses glass/metal/chemicals
-#define	AUTOLATHE		4	//Uses glass/metal only.
-#define CRAFTLATHE		8	//Uses fuck if I know. For use eventually.
-#define MECHFAB			16 	//Remember, objects utilising this flag should have construction_time and construction_cost vars.
-// #define PODFAB			32 	//Used by the spacepod part fabricator. Same idea as the mechfab // AA 2021-10-02 - Removed. Kept for flag consistency.
-#define BIOGENERATOR	64 	//Uses biomass
-#define SMELTER			128 //uses various minerals
+#define	IMPRINTER		(1<<0)	//For circuits. Uses glass/chemicals.
+#define PROTOLATHE		(1<<1)	//New stuff. Uses glass/metal/chemicals
+#define	AUTOLATHE		(1<<2)	//Uses glass/metal only.
+#define CRAFTLATHE		(1<<3)	//Uses fuck if I know. For use eventually.
+#define MECHFAB			(1<<4) 	//Remember, objects utilising this flag should have construction_time and construction_cost vars.
+// #define PODFAB			(1<<5) 	//Used by the spacepod part fabricator. Same idea as the mechfab // AA 2021-10-02 - Removed. Kept for flag consistency.
+#define BIOGENERATOR	(1<<6) 	//Uses biomass
+#define SMELTER			(1<<7) //uses various minerals
 /// Used for gamma armoury lathe designs
-#define GAMMALATHE		256
+#define GAMMALATHE		(1<<8)
 //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.
 
 
@@ -30,6 +30,10 @@
 #define SUPERMATTER_EMERGENCY 5		// Integrity < 50%
 #define SUPERMATTER_DELAMINATING 6	// Pretty obvious, Integrity < 25%
 
+// More defines for the suppermatter
+/// Higher == Crystal safe operational temperature is higher.
+#define SUPERMATTER_HEAT_PENALTY_THRESHOLD 40
+
 // Firelock states
 #define FD_OPEN 1
 #define FD_CLOSED 2
@@ -77,6 +81,22 @@
 #define AIR_ALARM_UNWIRED	1
 #define AIR_ALARM_READY		2
 
+/**
+ * Air alarm modes
+ */
+#define AALARM_MODE_SCRUBBING 1
+#define AALARM_MODE_VENTING 2 //makes draught
+#define AALARM_MODE_PANIC 3 //like siphon, but stronger (enables widenet)
+#define AALARM_MODE_REPLACEMENT 4 //sucks off all air, then refill and swithes to scrubbing
+#define AALARM_MODE_SIPHON 5 //Scrubbers suck air
+#define AALARM_MODE_CONTAMINATED 6 //Turns on all filtering and widenet scrubbing.
+#define AALARM_MODE_REFILL 7 //just like normal, but with triple the air output
+#define AALARM_MODE_OFF 8
+#define AALARM_MODE_FLOOD 9 //Emagged mode; turns off scrubbers and pressure checks on vents
+
 #define NUKE_STATUS_INTACT 0
 #define NUKE_CORE_MISSING 1
 #define NUKE_MISSING 2
+
+#define CIRCULATOR_SIDE_LEFT WEST
+#define CIRCULATOR_SIDE_RIGHT EAST

code/__DEFINES/mappers.dm

@@ -0,0 +1,17 @@
+/// Create directional subtypes for a path to simplify mapping.
+#define MAPPING_DIRECTIONAL_HELPERS(path, offset_y, offset_x) ##path/directional/north {\
+	dir = NORTH; \
+	pixel_y = offset_y; \
+} \
+##path/directional/south {\
+	dir = SOUTH; \
+	pixel_y = -offset_y; \
+} \
+##path/directional/east {\
+	dir = EAST; \
+	pixel_x = offset_x; \
+} \
+##path/directional/west {\
+	dir = WEST; \
+	pixel_x = -offset_x; \
+}

code/__DEFINES/martial_arts.dm

@@ -6,6 +6,7 @@
 #define MARTIAL_COMBO_DONE_CLEAR_COMBOS	5		// If the combo should do a basic hit after it's done
 
 #define MARTIAL_ARTS_CANNOT_USE 	-1
+#define MARTIAL_ARTS_ACT_SUCCESS	1
 
 #define MARTIAL_COMBO_STEP_HARM		"Harm"
 #define MARTIAL_COMBO_STEP_DISARM	"Disarm"

code/__DEFINES/misc_defines.dm

@@ -171,8 +171,8 @@
 #define MUTANTRACE_LAYER		39
 #define TAIL_UNDERLIMBS_LAYER	38	//Tail split-rendering.
 #define LIMBS_LAYER				37
-#define INTORGAN_LAYER			36
-#define MARKINGS_LAYER			35
+#define MARKINGS_LAYER			36
+#define INTORGAN_LAYER			35
 #define UNDERWEAR_LAYER			34
 #define MUTATIONS_LAYER			33
 #define H_DAMAGE_LAYER			32
@@ -392,12 +392,12 @@
 #define INVESTIGATE_BOMB "bombs"
 
 // The SQL version required by this version of the code
-#define SQL_VERSION 53
+#define SQL_VERSION 54
 
 // Vending machine stuff
-#define CAT_NORMAL 1
-#define CAT_HIDDEN 2
-#define CAT_COIN   4
+#define CAT_NORMAL (1<<0)
+#define CAT_HIDDEN (1<<1)
+#define CAT_COIN   (1<<2)
 
 // Jobs
 // used for alternate_option
@@ -412,11 +412,6 @@
 #define AREASELECT_CORNERA "corner A"
 #define AREASELECT_CORNERB "corner B"
 
-//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
-#define MOUSE_OPACITY_TRANSPARENT 0
-#define MOUSE_OPACITY_ICON 1
-#define MOUSE_OPACITY_OPAQUE 2
-
 // Defib stats
 /// Past this much time the patient is unrecoverable (in deciseconds).
 #define BASE_DEFIB_TIME_LIMIT (300 SECONDS)
@@ -481,9 +476,10 @@
 #define COLD_WATER_TEMPERATURE 283.15 // 10 degrees celsius
 
 // Parallax
+/// About 0.05 Seconds of delay
 #define PARALLAX_DELAY_DEFAULT	world.tick_lag
-#define PARALLAX_DELAY_MED		1
-#define PARALLAX_DELAY_LOW		2
+#define PARALLAX_DELAY_MED		0.1 SECONDS
+#define PARALLAX_DELAY_LOW		0.2 SECONDS
 #define PARALLAX_LOOP_TIME		25
 
 // Engine types
@@ -498,16 +494,16 @@
 #define SYMPTOM_ACTIVATION_PROB 3
 
 // Atmos stuff that fucking terrifies me
-#define LINDA_SPAWN_HEAT 1
-#define LINDA_SPAWN_20C 2
-#define LINDA_SPAWN_TOXINS 4
-#define LINDA_SPAWN_OXYGEN 8
-#define LINDA_SPAWN_CO2 16
-#define LINDA_SPAWN_NITROGEN 32
-#define LINDA_SPAWN_N2O 64
-#define LINDA_SPAWN_AGENT_B 128
-#define LINDA_SPAWN_AIR 256
-#define LINDA_SPAWN_COLD 512
+#define LINDA_SPAWN_HEAT 		(1<<0)
+#define LINDA_SPAWN_20C 		(1<<1)
+#define LINDA_SPAWN_TOXINS 		(1<<2)
+#define LINDA_SPAWN_OXYGEN 		(1<<3)
+#define LINDA_SPAWN_CO2 		(1<<4)
+#define LINDA_SPAWN_NITROGEN 	(1<<5)
+#define LINDA_SPAWN_N2O 		(1<<6)
+#define LINDA_SPAWN_AGENT_B 	(1<<7)
+#define LINDA_SPAWN_AIR 		(1<<8)
+#define LINDA_SPAWN_COLD 		(1<<9)
 
 // Throwing these defines here for the TM to minimise conflicts
 #define MAPROTATION_MODE_NORMAL_VOTE "Vote"
@@ -605,3 +601,91 @@
 #define TS_INFESTATION_WHITE_SPIDER 3
 #define TS_INFESTATION_PRINCESS_SPIDER 4
 #define TS_INFESTATION_QUEEN_SPIDER 5
+
+#define MAX_ALLOWED_TELEPORTS_PER_PROCESS 20
+
+#define CONSTRUCTION_PATH_FORWARDS -1
+#define CONSTRUCTION_PATH_BACKWARDS 1
+#define CONSTRUCTION_TOOL_BEHAVIOURS list(TOOL_CROWBAR, TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_WRENCH)
+
+#define WEATHER_STARTUP_STAGE 1
+#define WEATHER_MAIN_STAGE 2
+#define WEATHER_WIND_DOWN_STAGE 3
+#define WEATHER_END_STAGE 4
+
+/**
+ * I dont recommend touching these map generator defines unless you know what you're doing with maze generators.
+ */
+#define LOG_MAZE_PROGRESS(proc2run, opname) \
+do { \
+	var/timer = start_watch(); \
+	proc2run ;\
+	log_debug("\[MAZE] Operation '[opname]' on maze at [x],[y],[z] took [stop_watch(timer)]s"); \
+} while(FALSE)
+
+//clusterCheckFlags defines
+//All based on clusterMin and clusterMax as guides
+
+//Individual defines
+#define MAP_GENERATOR_CLUSTER_CHECK_NONE				0  //No checks are done, cluster as much as possible
+#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_TURFS	(1<<1)  //Don't let turfs of DIFFERENT types cluster
+#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_ATOMS	(1<<2)  //Don't let atoms of DIFFERENT types cluster
+#define MAP_GENERATOR_CLUSTER_CHECK_SAME_TURFS		(1<<3)  //Don't let turfs of the SAME type cluster
+#define MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS		(1<<4) //Don't let atoms of the SAME type cluster
+
+//Combined defines
+#define MAP_GENERATOR_CLUSTER_CHECK_SAMES				(MAP_GENERATOR_CLUSTER_CHECK_SAME_TURFS | MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS) //Don't let any of the same type cluster
+#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENTS		(MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_TURFS | MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_ATOMS) //Don't let any of different types cluster
+#define MAP_GENERATOR_CLUSTER_CHECK_ALL_TURFS			(MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_TURFS | MAP_GENERATOR_CLUSTER_CHECK_SAME_TURFS) //Don't let ANY turfs cluster same and different types
+#define MAP_GENERATOR_CLUSTER_CHECK_ALL_ATOMS			(MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_ATOMS | MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS) //Don't let ANY atoms cluster same and different types
+
+//All
+#define MAP_GENERATOR_CLUSTER_CHECK_ALL				((1<<4) - 2) //Don't let anything cluster, like, at all.  -2 because we skipped <<1 for some odd reason.
+
+// Buffer datatype flags.
+#define DNA2_BUF_UI (1<<0)
+#define DNA2_BUF_UE (1<<1)
+#define DNA2_BUF_SE (1<<2)
+
+#define CLONER_BIOMASS_REQUIRED 150
+
+#define SOLAR_MACHINERY_MAX_DIST 40
+
+#define AMMO_BOX_MULTI_SPRITE_STEP_NONE null
+#define AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF -1
+
+/// Detective's mode on pinpointers
+#define PINPOINTER_MODE_DET 7
+
+/// How frequently disposals can make sounds, to prevent huge sound stacking
+#define DISPOSAL_SOUND_COOLDOWN (0.1 SECONDS)
+
+/// The different kinds of voting
+#define VOTE_RESULT_TYPE_MAJORITY "Majority"
+
+#define HOLOPAD_MAX_DIAL_TIME 200
+
+#define PROJECTILE_IMPACT_WALL_DENT_HIT 1
+#define PROJECTILE_IMPACT_WALL_DENT_SHOT 2
+
+#define ASSEMBLY_WIRE_RECEIVE		(1<<0)	//Allows pulse(0) to call Activate()
+#define ASSEMBLY_WIRE_PULSE			(1<<1)	//Allows pulse(0) to act on the holder
+#define ASSEMBLY_WIRE_PULSE_SPECIAL	(1<<2)	//Allows pulse(0) to act on the holders special assembly
+#define ASSEMBLY_WIRE_RADIO_RECEIVE	(1<<3)	//Allows pulse(1) to call Activate()
+#define ASSEMBLY_WIRE_RADIO_PULSE	(1<<4)	//Allows pulse(1) to send a radio message
+
+
+//Types of usual spacevine mutations mutations
+#define	SPACEVINE_MUTATION_POSITIVE 			1
+#define	SPACEVINE_MUTATION_NEGATIVE			2
+#define	SPACEVINE_MUTATION_MINOR_NEGATIVE		3
+
+#define RETURN_PRECISE_POSITION(A) new /datum/position(A)
+#define RETURN_PRECISE_POINT(A) new /datum/point_precise(A)
+
+#define RETURN_POINT_VECTOR(ATOM, ANGLE, SPEED) (new /datum/point_precise/vector(ATOM, null, null, null, null, ANGLE, SPEED))
+#define RETURN_POINT_VECTOR_INCREMENT(ATOM, ANGLE, SPEED, AMT) (new /datum/point_precise/vector(ATOM, null, null, null, null, ANGLE, SPEED, AMT))
+
+#define TEAM_ADMIN_ADD_OBJ_SUCCESS				(1<<0)
+#define TEAM_ADMIN_ADD_OBJ_CANCEL_LOG 			(1<<1)
+#define TEAM_ADMIN_ADD_OBJ_PURPOSEFUL_CANCEL 	(1<<2)

code/__DEFINES/mob_defines.dm

@@ -67,9 +67,9 @@
 //feel free to add shit to lists below
 
 //Reagent Metabolization flags, defines the type of reagents that affect this mob
-#define PROCESS_ORG 1		//Only processes reagents with "ORGANIC" or "ORGANIC | SYNTHETIC"
-#define PROCESS_SYN 2		//Only processes reagents with "SYNTHETIC" or "ORGANIC | SYNTHETIC"
-#define PROCESS_DUO 4		//Only processes reagents with "ORGANIC | SYNTHETIC"
+#define PROCESS_ORG (1<<0)		//Only processes reagents with "ORGANIC" or "ORGANIC | SYNTHETIC"
+#define PROCESS_SYN (1<<1)		//Only processes reagents with "SYNTHETIC" or "ORGANIC | SYNTHETIC"
+#define PROCESS_DUO (1<<2)		//Only processes reagents with "ORGANIC | SYNTHETIC"
 
 #define HUMAN_STRIP_DELAY 40 //takes 40ds = 4s to strip someone.
 #define ALIEN_SELECT_AFK_BUFFER 1 // How many minutes that a person can be AFK before not being allowed to be an alien.
@@ -105,24 +105,24 @@
 #define SYNTHETIC 2
 
 // Appearance change flags
-#define APPEARANCE_UPDATE_DNA 1
-#define APPEARANCE_RACE	2|APPEARANCE_UPDATE_DNA
-#define APPEARANCE_GENDER 4|APPEARANCE_UPDATE_DNA
-#define APPEARANCE_SKIN 8
-#define APPEARANCE_HAIR 16
-#define APPEARANCE_HAIR_COLOR 32
-#define APPEARANCE_SECONDARY_HAIR_COLOR 64
-#define APPEARANCE_FACIAL_HAIR 128
-#define APPEARANCE_FACIAL_HAIR_COLOR 256
-#define APPEARANCE_SECONDARY_FACIAL_HAIR_COLOR 512
-#define APPEARANCE_EYE_COLOR 1024
-#define APPEARANCE_ALL_HAIR APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_SECONDARY_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR|APPEARANCE_SECONDARY_FACIAL_HAIR_COLOR
-#define APPEARANCE_HEAD_ACCESSORY 2048
-#define APPEARANCE_MARKINGS 4096
-#define APPEARANCE_BODY_ACCESSORY 8192
-#define APPEARANCE_ALT_HEAD 16384
-#define APPEARANCE_ALL_BODY APPEARANCE_ALL_HAIR|APPEARANCE_HEAD_ACCESSORY|APPEARANCE_MARKINGS|APPEARANCE_BODY_ACCESSORY|APPEARANCE_ALT_HEAD
-#define APPEARANCE_ALL 32767
+#define APPEARANCE_UPDATE_DNA 					(1<<0)
+#define APPEARANCE_RACE							(1<<1)|APPEARANCE_UPDATE_DNA
+#define APPEARANCE_GENDER 						(1<<2)|APPEARANCE_UPDATE_DNA
+#define APPEARANCE_SKIN 						(1<<3)
+#define APPEARANCE_HAIR 						(1<<4)
+#define APPEARANCE_HAIR_COLOR 					(1<<5)
+#define APPEARANCE_SECONDARY_HAIR_COLOR 		(1<<6)
+#define APPEARANCE_FACIAL_HAIR 					(1<<7)
+#define APPEARANCE_FACIAL_HAIR_COLOR 			(1<<8)
+#define APPEARANCE_SECONDARY_FACIAL_HAIR_COLOR 	(1<<9)
+#define APPEARANCE_EYE_COLOR 					(1<<10)
+#define APPEARANCE_ALL_HAIR 					(APPEARANCE_HAIR|APPEARANCE_HAIR_COLOR|APPEARANCE_SECONDARY_HAIR_COLOR|APPEARANCE_FACIAL_HAIR|APPEARANCE_FACIAL_HAIR_COLOR|APPEARANCE_SECONDARY_FACIAL_HAIR_COLOR)
+#define APPEARANCE_HEAD_ACCESSORY 				(1<<11)
+#define APPEARANCE_MARKINGS 					(1<<12)
+#define APPEARANCE_BODY_ACCESSORY 				(1<<13)
+#define APPEARANCE_ALT_HEAD 					(1<<14)
+#define APPEARANCE_ALL_BODY 					(APPEARANCE_ALL_HAIR|APPEARANCE_HEAD_ACCESSORY|APPEARANCE_MARKINGS|APPEARANCE_BODY_ACCESSORY|APPEARANCE_ALT_HEAD)
+#define APPEARANCE_ALL 							((1<<15)-1) // If you add or remove an appearance change flag above, make sure you update this define with the amount of the flags.
 
 #define STAMINA_REGEN_BLOCK_TIME (10 SECONDS)
 
@@ -154,10 +154,10 @@
 #define AI_CHECK_RADIO 2
 
 //determines if a mob can smash through it
-#define ENVIRONMENT_SMASH_NONE 0
-#define ENVIRONMENT_SMASH_STRUCTURES 1 //crates, lockers, ect
-#define ENVIRONMENT_SMASH_WALLS 2   //walls
-#define ENVIRONMENT_SMASH_RWALLS 4  //rwalls
+#define ENVIRONMENT_SMASH_NONE 			0
+#define ENVIRONMENT_SMASH_STRUCTURES 	(1<<0) //crates, lockers, ect
+#define ENVIRONMENT_SMASH_WALLS 		(1<<1) //walls
+#define ENVIRONMENT_SMASH_RWALLS 		(1<<2) //rwalls
 
 // Reproduction
 #define DEFAULT_MAX_OFFSPRING 8
@@ -165,13 +165,13 @@
 ///Flags used by the flags parameter of electrocute act.
 
 ///Makes it so that the shock doesn't take gloves into account.
-#define SHOCK_NOGLOVES (1 << 0)
+#define SHOCK_NOGLOVES 	(1<<0)
 ///Used when the shock is from a tesla bolt.
-#define SHOCK_TESLA (1 << 1)
+#define SHOCK_TESLA 	(1<<1)
 ///Used when an illusion shocks something. Makes the shock deal stamina damage and not trigger certain secondary effects.
-#define SHOCK_ILLUSION (1 << 2)
+#define SHOCK_ILLUSION 	(1<<2)
 ///The shock doesn't stun.
-#define SHOCK_NOSTUN (1 << 3)
+#define SHOCK_NOSTUN 	(1<<3)
 
 #define POCKET_STRIP_DELAY			40	//time taken (in deciseconds) to search somebody's pockets
 
@@ -192,11 +192,11 @@
 #define TINT_BLIND 3			//Threshold of tint level to obscure vision fully
 #define EYE_SHINE_THRESHOLD 6	//dark_view threshold past which a humanoid's eyes will 'shine' in the dark.
 
-#define STATUS_UPDATE_HEALTH 1
-#define STATUS_UPDATE_STAT 2
-#define STATUS_UPDATE_STAMINA 8
-#define STATUS_UPDATE_BLIND 16
-#define STATUS_UPDATE_NEARSIGHTED 64
+#define STATUS_UPDATE_HEALTH 		(1<<0)
+#define STATUS_UPDATE_STAT 			(1<<1)
+#define STATUS_UPDATE_STAMINA 		(1<<2)
+#define STATUS_UPDATE_BLIND 		(1<<3)
+#define STATUS_UPDATE_NEARSIGHTED 	(1<<4)
 
 #define STATUS_UPDATE_NONE 0
 #define STATUS_UPDATE_ALL (~0)
@@ -241,6 +241,7 @@
 #define isguardian(A)		(istype((A), /mob/living/simple_animal/hostile/guardian))
 #define isnymph(A)      	(istype((A), /mob/living/simple_animal/diona))
 #define ishostile(A) 		(istype((A), /mob/living/simple_animal/hostile))
+#define isretaliate(A) 		(istype((A), /mob/living/simple_animal/hostile/retaliate))
 #define isterrorspider(A) 	(istype((A), /mob/living/simple_animal/hostile/poison/terror_spider))
 #define isslaughterdemon(A) (istype((A), /mob/living/simple_animal/demon/slaughter))
 #define isdemon(A) 			(istype((A), /mob/living/simple_animal/demon))
@@ -275,8 +276,9 @@
 
 #define isnewplayer(A)  (istype((A), /mob/new_player))
 
-#define isorgan(A)		(istype((A), /obj/item/organ/external))
-#define hasorgans(A)	(iscarbon(A))
+#define is_external_organ(A)		(istype((A), /obj/item/organ/external))
+#define is_internal_organ(A)		(istype((A), /obj/item/organ/internal))
+#define	is_organ(A)				(istype((A), /obj/item/organ))
 
 #define is_admin(user)	(check_rights(R_ADMIN, 0, (user)) != 0)
 
@@ -330,3 +332,30 @@
 			return LEG_LEFT
 		if("l_foot")
 			return FOOT_LEFT
+
+#define SPINNING_WEB 1
+#define LAYING_EGGS 2
+#define MOVING_TO_TARGET 3
+#define SPINNING_COCOON 4
+
+#define TS_DAMAGE_SIMPLE 0
+#define TS_DAMAGE_POISON 1
+#define TS_DAMAGE_BRUTE 2
+
+#define TS_DESC_RED "Red - Assault"
+#define TS_DESC_GRAY "Gray - Ambush"
+#define TS_DESC_GREEN "Green - Nurse"
+#define TS_DESC_WHITE "White - Infect"
+#define TS_DESC_BLACK "Black - Poison"
+#define TS_DESC_PURPLE "Purple - Guard"
+#define TS_DESC_BROWN "Brown - Breacher"
+#define TS_DESC_PRINCE "Prince - HERO"
+#define TS_DESC_PRINCESS "Princess - HORDE"
+#define TS_DESC_MOTHER "Mother - SUPPORT"
+#define TS_DESC_QUEEN "Queen - LEADER"
+
+#define TS_TIER_1 1
+#define TS_TIER_2 2
+#define TS_TIER_3 3
+#define TS_TIER_4 4
+#define TS_TIER_5 5

code/__DEFINES/nanomob_defines.dm

@@ -0,0 +1,17 @@
+#define NANOMOB_TYPE_FIRE /datum/mob_type/fire
+#define NANOMOB_TYPE_WATER /datum/mob_type/water
+#define NANOMOB_TYPE_GRASS /datum/mob_type/grass
+#define NANOMOB_TYPE_ELECTRIC /datum/mob_type/electric
+#define NANOMOB_TYPE_GROUND /datum/mob_type/ground
+#define NANOMOB_TYPE_ROCK /datum/mob_type/rock
+#define NANOMOB_TYPE_BUG /datum/mob_type/bug
+#define NANOMOB_TYPE_POISON /datum/mob_type/poison
+#define NANOMOB_TYPE_NORMAL /datum/mob_type/normal
+#define NANOMOB_TYPE_FIGHTING /datum/mob_type/fighting
+#define NANOMOB_TYPE_PSYCHIC /datum/mob_type/psychic
+#define NANOMOB_TYPE_GHOST /datum/mob_type/ghost
+#define NANOMOB_TYPE_ICE /datum/mob_type/ice
+#define NANOMOB_TYPE_FLYING /datum/mob_type/flying
+#define NANOMOB_TYPE_BLUESPACE /datum/mob_type/bluespace
+#define NANOMOB_TYPE_DARK /datum/mob_type/dark
+#define NANOMOB_TYPE_STEEL /datum/mob_type/steel

code/__DEFINES/newscaster_defines.dm

@@ -0,0 +1,14 @@
+// Screen indexes
+/// Headlines screen index.
+#define NEWSCASTER_HEADLINES	0
+/// Available Jobs screen index.
+#define NEWSCASTER_JOBS			1
+/// View Channel screen index.
+#define NEWSCASTER_CHANNEL		2
+
+// Censor flags
+/// Censor author name.
+#define NEWSCASTER_CENSOR_AUTHOR (1 << 0)
+/// Censor story title, body and image.
+#define NEWSCASTER_CENSOR_STORY (1 << 1)
+