Merge remote-tracking branch 'origin/master' into rustsql

2021-01-20 15:40:41 +08:00
parent cd5d558fad 4a3fe48710
commit 125cd17cee
606 changed files with 9932 additions and 4818 deletions
@@ -1,6 +1,5 @@
 .dockerignore
 .editorconfig
-.travis.yml
 GPLv3.txt
 LICENSE
 README.md
@@ -26,5 +25,4 @@ tgstation.dyn.rsc
 libmariadb.dll
 rust_g.dll
 BSQL.dll
-appveyor.yml
 Dockerfile
@@ -38,5 +38,8 @@
 *.dmm text eol=lf merge=dmm
 *.dmi binary merge=dmi

+##Force tab indents on dm files
+*.dm whitespace=indent-with-non-tab
+
 ## Force changelog merging to use union
 html/changelog.html text eol=lf merge=union
@@ -0,0 +1,114 @@
+name: CI Suite
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+jobs:
+  run_linters:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    name: Run Linters
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup cache
+        uses: actions/cache@v2
+        with:
+          path: $HOME/SpacemanDMM
+          key: ${{ runner.os }}-spacemandmm
+      - name: Install Tools
+        run: |
+          pip3 install setuptools
+          bash tools/ci/install_build_tools.sh
+          bash tools/ci/install_spaceman_dmm.sh dreamchecker
+          pip3 install -r tools/mapmerge2/requirements.txt
+      - name: Run Linters
+        run: |
+          bash tools/ci/check_filedirs.sh tgstation.dme
+          bash tools/ci/check_changelogs.sh
+          find . -name "*.php" -print0 | xargs -0 -n1 php -l
+          find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
+          bash tools/ci/build_tgui.sh
+          bash tools/ci/check_grep.sh
+          python3 tools/mapmerge2/dmi.py --test
+          ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
+      - name: Annotate Lints
+        uses: yogstation13/DreamAnnotate@v1
+        if: always()
+        with:
+          outputFile: output-annotations.txt
+
+  compile_all_maps:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    name: Compile Maps
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup cache
+        uses: actions/cache@v2
+        with:
+          path: $HOME/BYOND
+          key: ${{ runner.os }}-byond
+      - name: Compile All Maps
+        run: |
+          bash tools/ci/install_byond.sh
+          source $HOME/BYOND/byond/bin/byondsetup
+          python3 tools/ci/template_dm_generator.py
+          bash tools/ci/dm.sh -DCIBUILDING -DCITESTING -DALL_MAPS tgstation.dme
+  run_all_tests:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    name: Integration Tests
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup cache
+        uses: actions/cache@v2
+        with:
+          path: $HOME/BYOND
+          key: ${{ runner.os }}-byond
+      - name: Setup database
+        run: |
+          sudo systemctl start mysql
+          mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
+          mysql -u root -proot tg_ci < SQL/tgstation_schema.sql
+          mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;'
+          mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql
+      - name: Install rust-g
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install libssl1.1:i386
+          bash tools/ci/install_rust_g.sh
+      # - name: Compile and run tests
+      #   run: |
+      #     bash tools/ci/install_byond.sh
+      #     source $HOME/BYOND/byond/bin/byondsetup
+      #     bash tools/ci/dm.sh -DCIBUILDING tgstation.dme
+      #     bash tools/ci/run_server.sh
+  test_windows:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    name: Windows Build
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Compile
+        run: pwsh tools/ci/build.ps1
+      - name: Create artifact
+        run: |
+          md deploy
+          bash tools/deploy.sh ./deploy
+      - name: Deploy artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: deploy
+          path: deploy
@@ -15,7 +15,7 @@ jobs:
          CHANGELOG_ENABLER: ${{ secrets.CHANGELOG_ENABLER }}
        run: |
          unset SECRET_EXISTS
-          if [-n $CHANGELOG_ENABLER]; then SECRET_EXISTS='true' ; fi
+          if [ -n $CHANGELOG_ENABLER ]; then SECRET_EXISTS='true' ; fi
          echo ::set-output name=CL_ENABLED::${SECRET_EXISTS}
      - name: "Setup python"
        if: steps.value_holder.outputs.CL_ENABLED
@@ -0,0 +1,22 @@
+name: Docker Build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build and Publish Docker Image to Registry
+        uses: elgohr/Publish-Docker-Github-Action@master
+        with:
+          name: tgstation/tgstation
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          dockerfile: Dockerfile
+          tags: "latest"
+          cache: true
@@ -0,0 +1,31 @@
+name: Generate documentation
+on:
+  push:
+    branches:
+    - master
+jobs:
+  generate_documentation:
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup cache
+        uses: actions/cache@v2
+        with:
+          path: $HOME/SpacemanDMM
+          key: ${{ runner.os }}-spacemandmm
+      - name: Install SpacemanDMM
+        run: bash tools/ci/install_spaceman_dmm.sh dmdoc
+      - name: Generate documentation
+        run: |
+          ~/dmdoc
+          touch dmdoc/.nojekyll
+          echo codedocs.tgstation13.org > dmdoc/CNAME
+      - name: Deploy
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        with:
+          BRANCH: gh-pages
+          CLEAN: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SINGLE_COMMIT: true
+          FOLDER: dmdoc
@@ -26,6 +26,7 @@ jobs:
        library-path: 'code/modules/tgs'

    - name: Commit and Push
+      continue-on-error: true
      run: |
        git config user.name tgstation-server
        git config user.email tgstation-server@users.noreply.github.com
@@ -35,6 +36,7 @@ jobs:

    - name: Create Pull Request
      uses: repo-sync/pull-request@v2
+      if: ${{ success() }}
      with:
        source_branch: "tgs-dmapi-update"
        destination_branch: "master"
@@ -42,4 +44,4 @@ jobs:
        pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging."
        pr_label: "Tools"
        pr_allow_empty: false
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        github_token: ${{ secrets.TGS_UPDATER }}
@@ -1,102 +0,0 @@
-language: generic
-os: linux
-dist: xenial
-
-branches:
-  except:
-  - ___TGS3TempBranch
-  - ___TGSTempBranch
-
-jobs:
-  include:
-    - name: "Run Linters"
-      addons:
-        apt:
-          packages:
-            - python3
-            - python3-pip
-            - python3-setuptools
-            - pcregrep
-            - rustc
-            - cargo
-      cache:
-        directories:
-          - $HOME/SpacemanDMM
-      install:
-        - tools/travis/install_build_tools.sh
-        - tools/travis/install_spaceman_dmm.sh dreamchecker
-      script:
-        - tools/travis/check_filedirs.sh tgstation.dme
-        - tools/travis/check_changelogs.sh
-        - find . -name "*.php" -print0 | xargs -0 -n1 php -l
-        - find . -name "*.json" -not -path "*/node_modules/*" -print0 | xargs -0 python3 ./tools/json_verifier.py
-        - tools/travis/build_tgui.sh
-        - tools/travis/check_grep.sh
-        - python3 tools/travis/check_line_endings.py
-        - ~/dreamchecker
-
-    - name: "Compile All Maps"
-      addons:
-        apt:
-          packages:
-            - libstdc++6:i386
-      cache:
-        directories:
-          - $HOME/BYOND
-      install:
-        - tools/travis/install_byond.sh
-        - source $HOME/BYOND/byond/bin/byondsetup
-      before_script:
-        - tools/travis/template_dm_generator.py
-      script:
-        - tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS tgstation.dme
-
-    - name: "Compile and Run Tests"
-      addons:
-        mariadb: '10.2'
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - libstdc++6:i386
-            - gcc-multilib
-            - g++-7
-            - g++-7-multilib
-            - libmariadb-client-lgpl-dev:i386
-            - libmariadbd-dev
-      cache:
-        directories:
-          - $HOME/BYOND
-          - $HOME/libmariadb
-      install:
-        - tools/travis/install_byond.sh
-        - source $HOME/BYOND/byond/bin/byondsetup
-        - tools/travis/install_libmariadb.sh
-        - tools/travis/install_rust_g.sh
-      before_script:
-        - mysql -u root -e 'CREATE DATABASE tg_travis;'
-        - mysql -u root tg_travis < SQL/tgstation_schema.sql
-        - mysql -u root -e 'CREATE DATABASE tg_travis_prefixed;'
-        - mysql -u root tg_travis_prefixed < SQL/tgstation_schema_prefixed.sql
-        - tools/travis/build_bsql.sh
-      script:
-        - tools/travis/dm.sh -DTRAVISBUILDING tgstation.dme || travis_terminate 1
-        - tools/travis/run_server.sh
-
-    # - name: "Generate Documentation"
-    #   # Only run for non-PR commits to the real master branch.
-    #   if: branch = master AND head_branch IS blank
-    #   install:
-    #     - tools/travis/install_spaceman_dmm.sh dmdoc
-    #   before_script:
-    #     # Travis checks out a hash, try to get back on a branch.
-    #     - git checkout $TRAVIS_BRANCH || true
-    #   script:
-    #     - ~/dmdoc
-    #     - touch dmdoc/.nojekyll
-    #   deploy:
-    #     provider: pages
-    #     skip_cleanup: true
-    #     local_dir: dmdoc
-    #     token: $DMDOC_GITHUB_TOKEN
-    #     fqdn: codedocs.tgstation13.org
@@ -1,9 +1,10 @@
 {
-    "recommendations": [
-        "gbasood.byond-dm-language-support",
-        "platymuus.dm-langclient",
+	"recommendations": [
+		"gbasood.byond-dm-language-support",
+		"platymuus.dm-langclient",
 		"EditorConfig.EditorConfig",
 		"arcanis.vscode-zipfs",
-		"dbaeumer.vscode-eslint"
-    ]
+		"dbaeumer.vscode-eslint",
+		"kevinkyang.auto-comment-blocks"
+	]
 }
@@ -1,14 +1,12 @@
-FROM tgstation/byond:513.1508 as base
+FROM tgstation/byond:513.1533 as base

-FROM base as build_base
+FROM base as rust_g

 RUN apt-get update \
    && apt-get install -y --no-install-recommends \
    git \
    ca-certificates

-FROM build_base as rust_g
-
 WORKDIR /rust_g

 RUN apt-get install -y --no-install-recommends \
@@ -27,36 +25,6 @@ RUN /bin/bash -c "source dependencies.sh \
    && git checkout FETCH_HEAD \
    && ~/.cargo/bin/cargo build --release

-FROM build_base as bsql
-
-WORKDIR /bsql
-
-RUN apt-get install -y --no-install-recommends software-properties-common \
-    && add-apt-repository ppa:ubuntu-toolchain-r/test \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-    cmake \
-    make \
-    g++-7 \
-    libmariadb-client-lgpl-dev \
-    && git init \
-    && git remote add origin https://github.com/tgstation/BSQL 
-
-COPY dependencies.sh .
-
-RUN /bin/bash -c "source dependencies.sh \
-    && git fetch --depth 1 origin \$BSQL_VERSION" \
-    && git checkout FETCH_HEAD
-
-WORKDIR /bsql/artifacts
-
-ENV CC=gcc-7 CXX=g++-7
-
-RUN ln -s /usr/include/mariadb /usr/include/mysql \
-    && ln -s /usr/lib/i386-linux-gnu /root/MariaDB \
-    && cmake .. \
-    && make
-
 FROM base as dm_base

 WORKDIR /tgstation
@@ -65,26 +33,30 @@ FROM dm_base as build

 COPY . .

-RUN DreamMaker -max_errors 0 tgstation.dme && tools/deploy.sh /deploy
+RUN DreamMaker -max_errors 0 tgstation.dme \
+    && tools/deploy.sh /deploy \
+	&& rm /deploy/*.dll

 FROM dm_base

 EXPOSE 1337

 RUN apt-get update \
+    && apt-get install -y --no-install-recommends software-properties-common \
+    && add-apt-repository ppa:ubuntu-toolchain-r/test \
+    && apt-get update \
+    && apt-get upgrade -y \
+    && apt-get dist-upgrade -y \
    && apt-get install -y --no-install-recommends \
+    libmariadb2 \
    mariadb-client \
    libssl1.0.0 \
    && rm -rf /var/lib/apt/lists/* \
    && mkdir -p /root/.byond/bin

 COPY --from=rust_g /rust_g/target/release/librust_g.so /root/.byond/bin/rust_g
-COPY --from=bsql /bsql/artifacts/src/BSQL/libBSQL.so ./
 COPY --from=build /deploy ./

-#bsql fexists memes
-RUN ln -s /tgstation/libBSQL.so /root/.byond/bin/libBSQL.so
-
 VOLUME [ "/tgstation/config", "/tgstation/data" ]

 ENTRYPOINT [ "DreamDaemon", "tgstation.dmb", "-port", "1337", "-trusted", "-close", "-verbose" ]
@@ -1,2 +1,9 @@
 [langserver]
 dreamchecker = true
+
+#[code_standards]
+#disallow_relative_type_definitions = true
+#disallow_relative_proc_definitions = true
+
+[dmdoc]
+use_typepath_names = true
@@ -1,22 +1,9 @@
 {
    "documentation": "/tg/station server 3 configuration file",
-    "changelog": {
-      "script": "tools/ss13_genchangelog.py",
-      "arguments": "html/changelog.html html/changelogs",
-      "pip_dependancies": [
-        "PyYaml",
-        "beautifulsoup4"
-      ]
-    },
-    "synchronize_paths": [
-      "html/changelog.html",
-      "html/changelogs/*"
-    ],
+    "synchronize_paths": [],
    "static_directories": [
      "config",
      "data"
    ],
-    "dlls": [
-      "libmariadb.dll"
-    ]
+    "dlls": []
  }
@@ -2372,7 +2372,7 @@
 	},
 /area/awaymission/BMPship/Midship)
 "hh" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
 /turf/open/floor/plating/airless,
 /area/awaymission/BMPship/Midship)
 "hi" = (
@@ -2729,9 +2729,7 @@
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/skelter/admin)
 "gx" = (
-/obj/machinery/door/firedoor{
-	pixel_x = 0
-	},
+/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -2742,9 +2740,7 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/ruin/space/has_grav/skelter/shields)
 "gy" = (
-/obj/machinery/door/firedoor{
-	pixel_x = 0
-	},
+/obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/door/airlock/engineering{
 	name = "Shields"
@@ -3170,7 +3170,9 @@
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
 "VY" = (
-/obj/structure/closet/emcloset,
+/obj/structure/closet/emcloset{
+	anchored = 1
+	},
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -2710,7 +2710,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
 /obj/effect/turf_decal/tile/green,
 /obj/effect/turf_decal/tile/green{
 	dir = 4
@@ -312,7 +312,7 @@
 /obj/structure/janitorialcart,
 /obj/item/mop,
 /obj/item/reagent_containers/glass/bucket,
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/awaymission/cabin)
@@ -13,7 +13,7 @@
 		#include "map_files\BoxStation\BoxStation.dmm"
 		#include "map_files\LambdaStation\lambda.dmm"

-		#ifdef TRAVISBUILDING
+		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif
 	#endif
@@ -3535,9 +3535,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/delivery,
-/obj/item/kirbyplants{
-	icon_state = "plant-21"
-	},
+/obj/machinery/gear_painter,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "ajL" = (
@@ -3823,6 +3821,9 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/item/kirbyplants{
+	icon_state = "plant-21"
+	},
 /turf/open/floor/plasteel/white/corner,
 /area/hallway/secondary/entry)
 "akn" = (
@@ -79384,6 +79385,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/gear_painter,
 /turf/open/floor/plasteel{
 	heat_capacity = 1e+006
 	},
@@ -48007,8 +48007,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
-/obj/structure/closet/wardrobe/mixed,
 /obj/machinery/light/small,
+/obj/effect/turf_decal/delivery,
+/obj/machinery/gear_painter,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/locker)
 "bzo" = (
@@ -48767,7 +48768,6 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/fitness/recreation)
 "bAA" = (
-/obj/structure/table,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -48777,11 +48777,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/item/storage/backpack{
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/storage/backpack,
 /obj/machinery/firealarm{
 	dir = 8;
 	pixel_x = 26
@@ -49398,6 +49393,7 @@
 	dir = 1;
 	name = "recreation camera"
 	},
+/obj/structure/closet/wardrobe/mixed,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
 "bBy" = (
@@ -54797,11 +54793,6 @@
 /area/hallway/secondary/exit/departure_lounge)
 "bKn" = (
 /obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -4;
-	pixel_y = 4
-	},
-/obj/item/pen,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -54810,6 +54801,11 @@
 /obj/machinery/airalarm{
 	pixel_y = 22
 	},
+/obj/item/storage/backpack{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/storage/backpack,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/fitness/recreation)
 "bKo" = (
@@ -55425,6 +55421,12 @@
 	pixel_x = 28;
 	pixel_y = 22
 	},
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/pen,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
 "bLd" = (
@@ -60844,6 +60846,11 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
+/obj/structure/table,
+/obj/item/toy/figure/assistant{
+	pixel_x = 8;
+	pixel_y = 6
+	},
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "bTD" = (
@@ -61021,6 +61028,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
 	dir = 10
 	},
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/pen,
 /turf/open/floor/plasteel,
 /area/hallway/secondary/entry)
 "bTO" = (
@@ -61259,19 +61272,8 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
-/obj/structure/table,
-/obj/item/paper_bin{
-	pixel_x = -4;
-	pixel_y = 4
-	},
-/obj/item/pen,
-/obj/item/toy/figure/assistant{
-	pixel_x = 8;
-	pixel_y = 6
-	},
-/obj/effect/turf_decal/loading_area{
-	dir = 1
-	},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/gear_painter,
 /turf/open/floor/plasteel/dark,
 /area/hallway/secondary/entry)
 "bUi" = (
@@ -71325,15 +71327,16 @@
 	icon_gib = "magicarp_gib";
 	icon_living = "magicarp";
 	icon_state = "magicarp";
-	maxHealth = 200;
 	max_co2 = 5;
 	max_tox = 2;
+	maxHealth = 200;
 	melee_damage_lower = 15;
 	melee_damage_upper = 20;
 	min_oxy = 5;
 	name = "Lia";
 	real_name = "Lia";
-	response_help = "pets";
+	response_help_continuous = "pets";
+	response_help_simple = "pet";
 	turns_per_move = 10
 	},
 /turf/open/floor/plasteel/dark,
@@ -10679,7 +10679,7 @@
 	light_color = "#e8eaff"
 	},
 /obj/machinery/vending/wardrobe/jani_wardrobe{
-	products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
+	products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/clothing/suit/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
 	},
 /turf/open/floor/plating,
 /area/janitor)
@@ -13637,7 +13637,7 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "IX" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -13764,6 +13764,7 @@
 /obj/effect/turf_decal/trimline/neutral/filled/corner{
 	dir = 4
 	},
+/obj/machinery/gear_painter,
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "Jp" = (
@@ -15268,6 +15268,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/item/kirbyplants{
+	icon_state = "plant-21"
+	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/dorms)
 "axG" = (
@@ -19618,9 +19621,6 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/dorms)
 "aEL" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-21"
-	},
 /obj/machinery/status_display{
 	pixel_y = -32
 	},
@@ -19635,6 +19635,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/gear_painter,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/dorms)
 "aEM" = (
@@ -511,10 +511,10 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
 "abi" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
-	dir = 8
+/obj/structure/disposalpipe/segment{
+	dir = 10
 	},
+/obj/machinery/gear_painter,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness/recreation)
 "abj" = (
@@ -2337,9 +2337,12 @@
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
 "afJ" = (
-/obj/effect/landmark/carpspawn,
-/turf/open/space/basic,
-/area/space/nearstation)
+/obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/hallway/primary/central)
 "afK" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
 	dir = 1
@@ -20027,9 +20030,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/maintenance/department/crew_quarters/bar)
 "aUQ" = (
@@ -20044,6 +20045,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
+	},
 /turf/open/floor/plasteel/dark,
 /area/hydroponics)
 "aUR" = (
@@ -20485,8 +20489,16 @@
 /turf/closed/wall,
 /area/janitor)
 "aVT" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/shutters{
+	id = "jangarage";
+	name = "Custodial Closet Shutters"
+	},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/janitor)
 "aVU" = (
 /obj/machinery/door/window/eastright{
@@ -20510,6 +20522,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plasteel/dark,
 /area/janitor)
 "aVV" = (
@@ -20892,9 +20905,6 @@
 /obj/machinery/camera{
 	c_tag = "Custodial Quarters"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
-	dir = 1
-	},
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -20915,6 +20925,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/janitor)
 "aWO" = (
@@ -20934,6 +20947,9 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
 /turf/open/floor/plasteel/dark,
 /area/janitor)
 "aWP" = (
@@ -23004,9 +23020,6 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "baW" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
 /obj/machinery/button/door{
 	id = "jangarage";
 	name = "Custodial Closet Shutters Control";
@@ -23014,14 +23027,12 @@
 	req_access_txt = "26"
 	},
 /obj/effect/turf_decal/tile/neutral,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "baX" = (
 /obj/vehicle/ridden/janicart,
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
 /obj/machinery/light{
 	dir = 8
 	},
@@ -23034,6 +23045,9 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
 /turf/open/floor/plasteel,
 /area/janitor)
 "baY" = (
@@ -23398,6 +23412,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
 /turf/open/floor/plasteel,
 /area/janitor)
 "bbY" = (
@@ -24603,7 +24620,7 @@
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
 "beS" = (
-/obj/item/caution,
+/obj/item/clothing/suit/caution,
 /turf/open/floor/plating,
 /area/maintenance/department/cargo)
 "beU" = (
@@ -31173,17 +31190,26 @@
 "bup" = (
 /obj/machinery/rnd/destructive_analyzer,
 /obj/effect/turf_decal/delivery,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/lab)
 "buq" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/lab)
 "bur" = (
 /obj/effect/turf_decal/delivery,
 /obj/machinery/rnd/production/protolathe/department/science,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/lab)
 "bus" = (
@@ -31202,6 +31228,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "but" = (
@@ -31664,6 +31693,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "bvA" = (
@@ -32372,6 +32402,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "bxh" = (
@@ -33056,12 +33087,6 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "byD" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 6
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/door/airlock/research{
 	name = "R&D Lab";
 	req_one_access_txt = "7;29;30"
@@ -33070,6 +33095,12 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/lab)
 "byE" = (
@@ -33091,7 +33122,6 @@
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "byG" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -33919,10 +33949,6 @@
 /area/hallway/primary/aft)
 "bAm" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall/r_wall,
 /area/hallway/primary/aft)
 "bAo" = (
@@ -33952,7 +33978,6 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -34404,17 +34429,14 @@
 	name = "RD Office APC";
 	pixel_x = -25
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hor)
@@ -34425,8 +34447,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hor)
@@ -34434,6 +34456,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hor)
 "bBt" = (
@@ -34441,6 +34466,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hor)
 "bBu" = (
@@ -34478,6 +34506,9 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/hor)
 "bBw" = (
@@ -35240,6 +35271,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hor)
 "bCK" = (
@@ -44248,9 +44280,11 @@
 /turf/open/floor/engine/co2,
 /area/engine/atmos)
 "bWh" = (
-/obj/effect/turf_decal/sand,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
-/area/chapel/office)
+/area/hallway/primary/aft)
 "bWi" = (
 /obj/structure/flora/ausbushes/leafybush,
 /obj/structure/flora/ausbushes/reedbush,
@@ -52824,6 +52858,9 @@
 /turf/closed/wall/r_wall,
 /area/science/lab)
 "cCt" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "cCB" = (
@@ -53058,6 +53095,9 @@
 	freq = 1400;
 	location = "Research Division"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/science/lab)
 "cXW" = (
@@ -53151,10 +53191,6 @@
 /area/maintenance/department/security/brig)
 "dhz" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/structure/chair{
 	dir = 8;
 	name = "Defense"
@@ -53163,9 +53199,6 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "dir" = (
@@ -53960,11 +53993,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 1
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
@@ -55488,6 +55521,12 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "ioj" = (
@@ -55591,6 +55630,9 @@
 /obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "iyg" = (
@@ -56345,9 +56387,13 @@
 /turf/open/floor/plasteel/white,
 /area/science/mixing)
 "koz" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "kpK" = (
@@ -56634,10 +56680,14 @@
 /turf/open/floor/plasteel/dark,
 /area/science/xenobiology)
 "kSb" = (
-/obj/structure/lattice,
-/obj/structure/grille,
-/turf/open/space/basic,
-/area/space)
+/obj/structure/chair/office/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
+/area/science/lab)
 "kSF" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -56711,6 +56761,10 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
 "lcU" = (
@@ -57121,6 +57175,7 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/science/lab)
 "meF" = (
@@ -57128,8 +57183,9 @@
 /turf/closed/wall/r_wall,
 /area/engine/supermatter)
 "mfC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/aft)
@@ -59138,6 +59194,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
+"qAx" = (
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal/bin,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness/recreation)
 "qAM" = (
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/item/cigbutt,
@@ -59336,6 +59399,7 @@
 /area/hallway/secondary/exit/departure_lounge)
 "qVk" = (
 /obj/machinery/door/poddoor/incinerator_atmos_aux,
+/obj/structure/lattice/catwalk,
 /turf/open/space/basic,
 /area/maintenance/disposal/incinerator)
 "qVP" = (
@@ -60486,6 +60550,9 @@
 	id = "research_shutters_2";
 	name = "research shutters"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/science/lab)
 "tLP" = (
@@ -60808,12 +60875,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 9
-	},
 /obj/structure/chair{
 	dir = 8;
 	name = "Defense"
@@ -60933,6 +60994,10 @@
 /obj/effect/turf_decal/plaque,
 /turf/open/floor/plating,
 /area/maintenance/department/engine)
+"uNA" = (
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/plasteel,
+/area/crew_quarters/fitness/recreation)
 "uQR" = (
 /obj/item/ammo_casing/shotgun/beanbag,
 /turf/open/floor/plating,
@@ -61489,12 +61554,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/xenobiology)
-"wfG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/closed/wall/r_wall,
-/area/crew_quarters/heads/hor)
 "wfO" = (
 /mob/living/simple_animal/hostile/retaliate/poison/snake,
 /turf/open/floor/plating,
@@ -76958,7 +77017,7 @@ aaa
 bOv
 bNs
 bNs
-bWh
+bQg
 bQg
 bQg
 bQg
@@ -84165,7 +84224,7 @@ bIZ
 cbb
 bDi
 ccO
-bIZ
+bva
 cjm
 cjm
 xgh
@@ -84425,8 +84484,8 @@ bva
 bva
 aht
 aht
-kSb
-kSb
+fon
+fon
 aht
 aht
 mau
@@ -86680,7 +86739,7 @@ aXL
 aYL
 aZN
 baW
-aKI
+afJ
 aKI
 beb
 aKI
@@ -86936,8 +86995,8 @@ aVS
 aXM
 aVS
 aVS
-aXM
-bbW
+aVS
+aVT
 bbW
 aVS
 aVS
@@ -87138,7 +87197,7 @@ aaa
 aaa
 aaa
 aaa
-afJ
+cFB
 aby
 aaa
 agQ
@@ -87445,7 +87504,7 @@ aRJ
 aSz
 aSz
 aUP
-aVT
+aVS
 aWN
 aXO
 aYM
@@ -89457,7 +89516,7 @@ aaa
 aaa
 aaa
 aaa
-afJ
+cFB
 aaa
 aaa
 abI
@@ -94921,12 +94980,12 @@ jcT
 xje
 tTl
 tTl
-tTl
+bWh
 gkS
 tTl
 tTl
 tTl
-koz
+tTl
 dgg
 phJ
 phJ
@@ -95178,7 +95237,7 @@ bjm
 mhn
 cqi
 cqi
-cqi
+koz
 cqi
 cqi
 imE
@@ -95697,7 +95756,7 @@ duF
 bxa
 byE
 bBp
-wfG
+bBp
 bBp
 bBp
 bBp
@@ -95950,7 +96009,7 @@ cCl
 brq
 byF
 cCt
-byF
+kSb
 bxc
 nIU
 bAo
@@ -104126,8 +104185,8 @@ aaY
 awB
 abe
 abi
-axw
-axw
+uNA
+qAx
 axw
 axw
 aBX
@@ -10524,6 +10524,10 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/control)
+"yl" = (
+/obj/machinery/gear_painter,
+/turf/open/indestructible/hotelwood,
+/area/centcom/holding)
 "yn" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/sign/warning/vacuum,
@@ -43992,7 +43996,7 @@ NS
 Nd
 ZL
 NS
-NS
+yl
 Nd
 CU
 NS
@@ -33,8 +33,8 @@
 "bg" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/toolbox/mechanical{
-	pixel_y = 8;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 8
 	},
 /obj/item/storage/toolbox/electrical,
 /obj/effect/turf_decal/stripes/line,
@@ -43,8 +43,8 @@
 "bS" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/lights/mixed{
-	pixel_y = 9;
-	pixel_x = -5
+	pixel_x = -5;
+	pixel_y = 9
 	},
 /obj/item/storage/box/matches{
 	pixel_y = 5
@@ -413,8 +413,8 @@
 	pixel_y = 4
 	},
 /obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy{
-	pixel_y = 5;
-	pixel_x = 6
+	pixel_x = 6;
+	pixel_y = 5
 	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
@@ -494,8 +494,8 @@
 /area/shuttle/escape)
 "rg" = (
 /obj/item/clothing/glasses/welding{
-	pixel_y = 8;
-	pixel_x = 3
+	pixel_x = 3;
+	pixel_y = 8
 	},
 /obj/item/weldingtool/largetank{
 	pixel_x = -3
@@ -882,8 +882,8 @@
 	},
 /obj/structure/table/glass,
 /obj/item/storage/box/monkeycubes{
-	pixel_y = 10;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = 10
 	},
 /obj/item/reagent_containers/food/snacks/cube/monkey{
 	pixel_x = 5
@@ -1156,8 +1156,8 @@
 	},
 /obj/structure/table/glass,
 /obj/item/clothing/suit/monkeysuit{
-	pixel_y = 4;
-	pixel_x = -2
+	pixel_x = -2;
+	pixel_y = 4
 	},
 /obj/item/clothing/mask/gas/monkeymask{
 	pixel_x = 5;
@@ -1169,6 +1169,7 @@
 /obj/machinery/door/airlock/titanium{
 	name = "Emergency Shuttle Airlock"
 	},
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "ST" = (
@@ -1319,6 +1320,7 @@
 	name = "Emergency Shuttle Airlock"
 	},
 /obj/docking_port/mobile/emergency,
+/obj/structure/fans/tiny,
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
 "Yu" = (
@@ -1,15 +0,0 @@
-version: '{build}'
-skip_branch_with_pr: true
-shallow_clone: true
-branches:
-  except:
-    - ___TGS3TempBranch
-    - ___TGSTempBranch
-cache:
-  - C:\byond\ -> dependencies.sh
-build_script:
-  - ps: tools/appveyor/build.ps1
-  - ps: "$deployPath = $env:APPVEYOR_BUILD_FOLDER + '/deploy'; bash tools/deploy.sh $deployPath" 
-  - ps: "[System.IO.Compression.ZipFile]::CreateFromDirectory($env:APPVEYOR_BUILD_FOLDER + '/deploy', $env:APPVEYOR_BUILD_FOLDER + '/deploy.zip')"
-artifacts:
-  - path: deploy.zip
@@ -22,49 +22,45 @@
 #define START_PROCESSING(Processor, Datum) if (!(Datum.datum_flags & DF_ISPROCESSING)) {Datum.datum_flags |= DF_ISPROCESSING;Processor.processing += Datum}
 #define STOP_PROCESSING(Processor, Datum) Datum.datum_flags &= ~DF_ISPROCESSING;Processor.processing -= Datum;Processor.currentrun -= Datum

-//SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier)
+//! 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<<0)
+/// subsystem does not initialize.
+#define SS_NO_INIT 1

-//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					(1<<1)
+/** 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

-//subsystem only runs on spare cpu (after all non-background subsystems have ran that tick)
-//	SS_BACKGROUND has its own priority bracket
-#define SS_BACKGROUND				(1<<2)
+/** 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

-//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			(1<<3)
+/// 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

-//Treat wait as a tick count, not DS, run every wait ticks.
-//	(also forces it to run first in the tick, above even SS_NO_TICK_CHECK subsystems)
-//	(implies all runlevels because of how it works)
-//	(overrides SS_BACKGROUND)
-//	This is designed for basically anything that works as a mini-mc (like SStimer)
-#define SS_TICKER					(1<<4)
+/** 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

-//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				(1<<5)
+/** 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

-//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			(1<<6)
+/** 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

-/// Show in stat() by default even if SS_NO_FIRE
-#define SS_ALWAYS_SHOW_STAT			(1<<7)
-
-//SUBSYSTEM STATES
-#define SS_IDLE 0		//aint doing shit.
-#define SS_QUEUED 1		//queued to run
-#define SS_RUNNING 2	//actively running
-#define SS_PAUSED 3		//paused by mc_tick_check
-#define SS_SLEEPING 4	//fire() slept.
-#define SS_PAUSING 5 	//in the middle of pausing
+//! SUBSYSTEM STATES
+#define SS_IDLE 0		/// ain't doing shit.
+#define SS_QUEUED 1		/// queued to run
+#define SS_RUNNING 2	/// actively running
+#define SS_PAUSED 3		/// paused by mc_tick_check
+#define SS_SLEEPING 4	/// fire() slept.
+#define SS_PAUSING 5 	/// in the middle of pausing

 #define SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/##X);\
 /datum/controller/subsystem/##X/New(){\
@@ -1 +1,38 @@
-#define EXTOOLS (world.system_type == MS_WINDOWS ? "byond-extools.dll" : "libbyond-extools.so")
+// _extools_api.dm - DM API for extools extension library
+// (blatently stolen from rust_g)
+//
+// To configure, create a `extools.config.dm` and set what you care about from
+// the following options:
+//
+// #define EXTOOLS "path/to/extools"
+// Override the .dll/.so detection logic with a fixed path or with detection
+// logic of your own.
+
+#ifndef EXTOOLS
+// Default automatic EXTOOLS detection.
+// On Windows, looks in the standard places for `byond-extools.dll`.
+// On Linux, looks in the standard places for`libbyond-extools.so`.
+
+/* This comment bypasses grep checks */ /var/__extools
+
+/proc/__detect_extools()
+	if (world.system_type == UNIX)
+		if (fexists("./libbyond-extools.so"))
+			// No need for LD_LIBRARY_PATH badness.
+			return __extools = "./libbyond-extools.so"
+		else
+			// It's not in the current directory, so try others
+			return __extools = "libbyond-extools.so"
+	else
+		return __extools = "byond-extools.dll"
+
+#define EXTOOLS (__extools || __detect_extools())
+#endif
+
+#ifndef UNIT_TESTS // use default logging as extools is broken on travis
+#define EXTOOLS_LOGGING // rust_g is used as a fallback if this is undefined
+#endif
+
+/proc/extools_log_write()
+
+/proc/extools_finalize_logging()
@@ -163,5 +163,19 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 	else if(!HAS_TRAIT(x, TRAIT_KEEP_TOGETHER))\
 	 	x.appearance_flags &= ~KEEP_TOGETHER

+//dir macros
+///Returns true if the dir is diagonal, false otherwise
+#define ISDIAGONALDIR(d) (d&(d-1))
+///True if the dir is north or south, false therwise
+#define NSCOMPONENT(d)   (d&(NORTH|SOUTH))
+///True if the dir is east/west, false otherwise
+#define EWCOMPONENT(d)   (d&(EAST|WEST))
+///Flips the dir for north/south directions
+#define NSDIRFLIP(d)     (d^(NORTH|SOUTH))
+///Flips the dir for east/west directions
+#define EWDIRFLIP(d)     (d^(EAST|WEST))
+///Turns the dir by 180 degrees
+#define DIRFLIP(d)       turn(d, 180)
+
 /// 33554431 (2^24 - 1) is the maximum value our bitflags can reach.
 #define MAX_BITFLAG_DIGITS 8
@@ -91,3 +91,6 @@

 #define SPAM_TRIGGER_WARNING	5	//Number of identical messages required before the spam-prevention will warn you to stfu
 #define SPAM_TRIGGER_AUTOMUTE	10	//Number of identical messages required before the spam-prevention will automute you
+
+#define STICKYBAN_DB_CACHE_TIME 10 SECONDS
+#define STICKYBAN_ROGUE_CHECK_TIME 5
@@ -6,9 +6,16 @@

 #define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) )

+/// Signifies that this proc is used to handle signals.
+/// Every proc you pass to RegisterSignal must have this.
+#define SIGNAL_HANDLER SHOULD_NOT_SLEEP(TRUE)
+
+/// Signifies that this proc is used to handle signals, but also sleeps.
+/// Do not use this for new work.
+#define SIGNAL_HANDLER_DOES_SLEEP
+
 /// A wrapper for _AddElement that allows us to pretend we're using normal named arguments
 #define AddElement(arguments...) _AddElement(list(##arguments))
-
 /// A wrapper for _RemoveElement that allows us to pretend we're using normal named arguments
 #define RemoveElement(arguments...) _RemoveElement(list(##arguments))

@@ -136,11 +136,15 @@
 #define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand"				//from base of atom/attack_hand(): (mob/user)
 #define COMSIG_ATOM_ATTACK_PAW "atom_attack_paw"				//from base of atom/attack_paw(): (mob/user)
 	#define COMPONENT_NO_ATTACK_HAND 1							//works on all 3.
+/////////////////
+
 //This signal return value bitflags can be found in __DEFINES/misc.dm
 #define COMSIG_ATOM_INTERCEPT_Z_FALL "movable_intercept_z_impact"	//called for each movable in a turf contents on /turf/zImpact(): (atom/movable/A, levels)

-
-/////////////////
+/// Called from orbit component: (atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+#define COMSIG_ATOM_ORBIT_BEGIN "atom_orbit_begin"
+/// Called from orbit component: (atom/movable/orbiter, refreshing)
+#define COMSIG_ATOM_ORBIT_END "atom_orbit_end"

 #define COMSIG_ENTER_AREA "enter_area" 						//from base of area/Entered(): (/area)
 #define COMSIG_EXIT_AREA "exit_area" 							//from base of area/Exited(): (/area)
@@ -536,3 +540,7 @@
 #define COMSIG_XENO_TURF_CLICK_SHIFT "xeno_turf_click_shift"				//from turf ShiftClickOn(): (/mob)
 #define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt"					//from turf AltClickOn(): (/mob)
 #define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl"				//from monkey CtrlClickOn(): (/mob)
+
+// twitch plays
+/// Returns direction: (wipe_votes)
+#define COMSIG_TWITCH_PLAYS_MOVEMENT_DATA "twitch_plays_movement_data"
@@ -55,6 +55,9 @@
 //donator items
 #define LOADOUT_CATEGORY_DONATOR	"Donator"

+//unlockable items
+#define LOADOUT_CATEGORY_UNLOCKABLE	"Unlockable"
+
 //how many prosthetics can we have
 #define MAXIMUM_LOADOUT_PROSTHETICS	2

@@ -61,7 +61,7 @@
 #define BODYPART_NANITES   4

 #define HYBRID_BODYPART_DAMAGE_THRESHHOLD 25 //How much damage has to be suffered until the damage threshhold counts as passed
-#define HYBRID_BODYPART_THESHHOLD_MINDAMAGE 15 //Which damage value this limb cannot be healed out of via easy nonsurgical means if the threshhold has been passed, state resets if damage value goes below mindamage.
+#define HYBRID_BODYPART_THESHHOLD_MINDAMAGE 10 //Which damage value this limb cannot be healed out of via easy nonsurgical means if the threshhold has been passed, state resets if damage value goes below mindamage.

 #define BODYPART_NOT_DISABLED 0
 #define BODYPART_DISABLED_DAMAGE 1
@@ -0,0 +1,26 @@
+/// The minimum for glide_size to be clamped to.
+#define MIN_GLIDE_SIZE 1
+/// The maximum for glide_size to be clamped to.
+/// This shouldn't be higher than the icon size, and generally you shouldn't be changing this, but it's here just in case.
+#define MAX_GLIDE_SIZE 32
+
+/// Compensating for time dialation
+GLOBAL_VAR_INIT(glide_size_multiplier, 1.0)
+
+///Broken down, here's what this does:
+/// divides the world icon_size (32) by delay divided by ticklag to get the number of pixels something should be moving each tick.
+/// The division result is given a min value of 1 to prevent obscenely slow glide sizes from being set
+/// Then that's multiplied by the global glide size multiplier. 1.25 by default feels pretty close to spot on. This is just to try to get byond to behave.
+/// The whole result is then clamped to within the range above.
+/// Not very readable but it works
+#define DELAY_TO_GLIDE_SIZE(delay) (clamp(((32 / max((delay) / world.tick_lag, 1)) * GLOB.glide_size_multiplier), MIN_GLIDE_SIZE, MAX_GLIDE_SIZE))
+
+/// Enables smooth movement
+// #define SMOOTH_MOVEMENT
+
+/// Set appearance flags in vars
+#ifdef SMOOTH_MOVEMENT
+	#define SET_APPEARANCE_FLAGS(_flags) appearance_flags = (_flags | LONG_GLIDE)
+#else
+	#define SET_APPEARANCE_FLAGS(_flags) appearance_flags = _flags
+#endif
@@ -3,6 +3,7 @@
 #define CHANNEL_ADMIN 1023
 #define CHANNEL_VOX 1022
 #define CHANNEL_JUKEBOX 1021
+
 #define CHANNEL_JUKEBOX_START 1016 //The gap between this and CHANNEL_JUKEBOX determines the amount of free jukebox channels. This currently allows 6 jukebox channels to exist.
 #define CHANNEL_JUSTICAR_ARK 1015
 #define CHANNEL_HEARTBEAT 1014 //sound channel for heartbeats
@@ -15,6 +16,17 @@
 #define CHANNEL_DIGEST 1009
 #define CHANNEL_PREYLOOP 1008

+///Default range of a sound.
+#define SOUND_RANGE 17
+///default extra range for sounds considered to be quieter
+#define SHORT_RANGE_SOUND_EXTRARANGE -9
+///The range deducted from sound range for things that are considered silent / sneaky
+#define SILENCED_SOUND_EXTRARANGE -11
+///Percentage of sound's range where no falloff is applied
+#define SOUND_DEFAULT_FALLOFF_DISTANCE 1 //For a normal sound this would be 1 tile of no falloff
+///The default exponent of sound falloff
+#define SOUND_FALLOFF_EXPONENT 6
+
 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED

@@ -23,6 +35,7 @@
 #define MAX_INSTRUMENT_CHANNELS (128 * 6)

 #define SOUND_MINIMUM_PRESSURE 10
+/// remove
 #define FALLOFF_SOUNDS 1


@@ -53,7 +66,8 @@
 #define MINING list('sound/ambience/ambimine.ogg', 'sound/ambience/ambicave.ogg', 'sound/ambience/ambiruin.ogg',\
 											'sound/ambience/ambiruin2.ogg',  'sound/ambience/ambiruin3.ogg',  'sound/ambience/ambiruin4.ogg',\
 											'sound/ambience/ambiruin5.ogg',  'sound/ambience/ambiruin6.ogg',  'sound/ambience/ambiruin7.ogg',\
-											'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint1.ogg', 'sound/ambience/ambilava.ogg')
+											'sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambimaint1.ogg',\
+											'sound/ambience/ambilava.ogg')

 #define MEDICAL list('sound/ambience/ambinice.ogg')

@@ -80,3 +94,55 @@
 	'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
 	'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
 	'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg')
+
+
+#define INTERACTION_SOUND_RANGE_MODIFIER -3
+#define EQUIP_SOUND_VOLUME 30
+#define PICKUP_SOUND_VOLUME 15
+#define DROP_SOUND_VOLUME 20
+#define YEET_SOUND_VOLUME 90
+
+
+//default byond sound environments
+#define SOUND_ENVIRONMENT_NONE -1
+#define SOUND_ENVIRONMENT_GENERIC 0
+#define SOUND_ENVIRONMENT_PADDED_CELL 1
+#define SOUND_ENVIRONMENT_ROOM 2
+#define SOUND_ENVIRONMENT_BATHROOM 3
+#define SOUND_ENVIRONMENT_LIVINGROOM 4
+#define SOUND_ENVIRONMENT_STONEROOM 5
+#define SOUND_ENVIRONMENT_AUDITORIUM 6
+#define SOUND_ENVIRONMENT_CONCERT_HALL 7
+#define SOUND_ENVIRONMENT_CAVE 8
+#define SOUND_ENVIRONMENT_ARENA 9
+#define SOUND_ENVIRONMENT_HANGAR 10
+#define SOUND_ENVIRONMENT_CARPETED_HALLWAY 11
+#define SOUND_ENVIRONMENT_HALLWAY 12
+#define SOUND_ENVIRONMENT_STONE_CORRIDOR 13
+#define SOUND_ENVIRONMENT_ALLEY 14
+#define SOUND_ENVIRONMENT_FOREST 15
+#define SOUND_ENVIRONMENT_CITY 16
+#define SOUND_ENVIRONMENT_MOUNTAINS 17
+#define SOUND_ENVIRONMENT_QUARRY 18
+#define SOUND_ENVIRONMENT_PLAIN 19
+#define SOUND_ENVIRONMENT_PARKING_LOT 20
+#define SOUND_ENVIRONMENT_SEWER_PIPE 21
+#define SOUND_ENVIRONMENT_UNDERWATER 22
+#define SOUND_ENVIRONMENT_DRUGGED 23
+#define SOUND_ENVIRONMENT_DIZZY 24
+#define SOUND_ENVIRONMENT_PSYCHOTIC 25
+//If we ever make custom ones add them here
+
+//"sound areas": easy way of keeping different types of areas consistent.
+#define SOUND_AREA_STANDARD_STATION SOUND_ENVIRONMENT_PARKING_LOT
+#define SOUND_AREA_LARGE_ENCLOSED SOUND_ENVIRONMENT_QUARRY
+#define SOUND_AREA_SMALL_ENCLOSED SOUND_ENVIRONMENT_BATHROOM
+#define SOUND_AREA_TUNNEL_ENCLOSED SOUND_ENVIRONMENT_STONEROOM
+#define SOUND_AREA_LARGE_SOFTFLOOR SOUND_ENVIRONMENT_CARPETED_HALLWAY
+#define SOUND_AREA_MEDIUM_SOFTFLOOR SOUND_ENVIRONMENT_LIVINGROOM
+#define SOUND_AREA_SMALL_SOFTFLOOR SOUND_ENVIRONMENT_ROOM
+#define SOUND_AREA_ASTEROID SOUND_ENVIRONMENT_CAVE
+#define SOUND_AREA_SPACE SOUND_ENVIRONMENT_UNDERWATER
+#define SOUND_AREA_LAVALAND SOUND_ENVIRONMENT_MOUNTAINS
+#define SOUND_AREA_ICEMOON SOUND_ENVIRONMENT_CAVE
+#define SOUND_AREA_WOODFLOOR SOUND_ENVIRONMENT_CITY
@@ -29,5 +29,5 @@
 #endif

 /world/proc/enable_debugger()
-    if (fexists(EXTOOLS))
-        call(EXTOOLS, "debug_initialize")()
+	if (fexists(EXTOOLS))
+		call(EXTOOLS, "debug_initialize")()
@@ -5,6 +5,7 @@
 #define SPECIES_ANDROID				"android"
 #define SPECIES_ANGEL				"angel"
 #define SPECIES_MAMMAL				"mammal"
+	#define SPECIES_MAMMAL_SYNTHETIC "mammal_synthetic"
 #define SPECIES_ARACHNID			"arachnid"
 #define SPECIES_INSECT				"insect"
 #define SPECIES_DULLAHAN			"dullahan"
@@ -40,6 +40,9 @@

 #define STATUS_EFFECT_DETERMINED /datum/status_effect/determined //currently in a combat high from being seriously wounded

+#define STATUS_EFFECT_MANTRA /datum/status_effect/mantra // a toggled self buff that makes you stronger and more resilient, but drains stamina over time
+#define STATUS_EFFECT_ASURA /datum/status_effect/asura // like a weaker version of mantra, drains HP instead of stamina and has no armor
+
 /////////////
 // DEBUFFS //
 /////////////
@@ -102,10 +105,6 @@

 #define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus //gives you fluff messages for cough, sneeze, headache, etc but without an actual virus

-#define STATUS_EFFECT_BREASTS_ENLARGEMENT /datum/status_effect/chem/breast_enlarger //Applied slowdown due to the ominous bulk.
-
-#define STATUS_EFFECT_PENIS_ENLARGEMENT /datum/status_effect/chem/penis_enlarger //More applied slowdown, just like the above.
-
 #define STATUS_EFFECT_NO_COMBAT_MODE /datum/status_effect/no_combat_mode //Wont allow combat mode and will disable it
 #define STATUS_EFFECT_MESMERIZE /datum/status_effect/mesmerize //Just reskinned no_combat_mode

@@ -1,40 +1,90 @@
-//Update this whenever the db schema changes
-//make sure you add an update to the schema_version stable in the db changelog
+//! Defines for subsystems and overlays
+//!
+//! Lots of important stuff in here, make sure you have your brain switched on
+//! when editing this file
+
+//! ## DB defines
+/**
+ * DB major schema version
+ *
+ * Update this whenever the db schema changes
+ *
+ * make sure you add an update to the schema_version stable in the db changelog
+ */
 #define DB_MAJOR_VERSION 4
+
+/**
+ * DB minor schema version
+ *
+ * Update this whenever the db schema changes
+ *
+ * make sure you add an update to the schema_version stable in the db changelog
+ */
 #define DB_MINOR_VERSION 7

-//Timing subsystem
-//Don't run if there is an identical unique timer active
-//if the arguments to addtimer are the same as an existing timer, it doesn't create a new timer, and returns the id of the existing timer
+//! ## Timing subsystem
+/**
+ * Don't run if there is an identical unique timer active
+ *
+ * if the arguments to addtimer are the same as an existing timer, it doesn't create a new timer,
+ * and returns the id of the existing timer
+ */
 #define TIMER_UNIQUE			(1<<0)
-//For unique timers: Replace the old timer rather then not start this one
+
+///For unique timers: Replace the old timer rather then not start this one
 #define TIMER_OVERRIDE			(1<<1)
-//Timing should be based on how timing progresses on clients, not the sever.
-//	tracking this is more expensive,
-//	should only be used in conjuction with things that have to progress client side, such as animate() or sound()
+
+/**
+ * Timing should be based on how timing progresses on clients, not the server.
+ *
+ * Tracking this is more expensive,
+ * should only be used in conjuction with things that have to progress client side, such as
+ * animate() or sound()
+ */
 #define TIMER_CLIENT_TIME		(1<<2)
-//Timer can be stopped using deltimer()
+
+///Timer can be stopped using deltimer()
 #define TIMER_STOPPABLE			(1<<3)
-//To be used with TIMER_UNIQUE
-//prevents distinguishing identical timers with the wait variable
+
+///prevents distinguishing identical timers with the wait variable
+///
+///To be used with TIMER_UNIQUE
 #define TIMER_NO_HASH_WAIT		(1<<4)
-//Loops the timer repeatedly until qdeleted
-//In most cases you want a subsystem instead
+
+///Loops the timer repeatedly until qdeleted
+///
+///In most cases you want a subsystem instead, so don't use this unless you have a good reason
 #define TIMER_LOOP				(1<<5)

-#define TIMER_NO_INVOKE_WARNING 600 //number of byond ticks that are allowed to pass before the timer subsystem thinks it hung on something
-
+///Empty ID define
 #define TIMER_ID_NULL -1

-#define INITIALIZATION_INSSATOMS 0	//New should not call Initialize
-#define INITIALIZATION_INNEW_MAPLOAD 2	//New should call Initialize(TRUE)
-#define INITIALIZATION_INNEW_REGULAR 1	//New should call Initialize(FALSE)
+//! ## Initialization subsystem

-#define INITIALIZE_HINT_NORMAL 0    //Nothing happens
-#define INITIALIZE_HINT_LATELOAD 1  //Call LateInitialize
-#define INITIALIZE_HINT_QDEL 2  //Call qdel on the atom
+///New should not call Initialize
+#define INITIALIZATION_INSSATOMS 0
+///New should call Initialize(TRUE)
+#define INITIALIZATION_INNEW_MAPLOAD 2
+///New should call Initialize(FALSE)
+#define INITIALIZATION_INNEW_REGULAR 1

-//type and all subtypes should always call Initialize in New()
+//! ### Initialization hints
+
+///Nothing happens
+#define INITIALIZE_HINT_NORMAL 0
+/**
+ * call LateInitialize at the end of all atom Initalization
+ *
+ * The item will be added to the late_loaders list, this is iterated over after
+ * initalization of subsystems is complete and calls LateInitalize on the atom
+ * see [this file for the LateIntialize proc](atom.html#proc/LateInitialize)
+ */
+#define INITIALIZE_HINT_LATELOAD 1
+
+///Call qdel on the atom after intialization
+#define INITIALIZE_HINT_QDEL 2
+
+///type and all subtypes should always immediately call Initialize in New()
 #define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\
 	..();\
 	if(!(flags_1 & INITIALIZED_1)) {\
@@ -47,35 +97,40 @@
 // Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.

-#define INIT_ORDER_PROFILER			100
-#define INIT_ORDER_FAIL2TOPIC		99
-#define INIT_ORDER_TITLE			98
-#define INIT_ORDER_GARBAGE			95
-#define INIT_ORDER_DBCORE			94
-#define INIT_ORDER_STATPANELS		93
-#define INIT_ORDER_BLACKBOX			92
-#define INIT_ORDER_SERVER_MAINT		91
-#define INIT_ORDER_INPUT			90
-#define INIT_ORDER_SOUNDS			85
+#define INIT_ORDER_PROFILER			102
+#define INIT_ORDER_FAIL2TOPIC		101
+#define INIT_ORDER_TITLE			100
+#define INIT_ORDER_GARBAGE			99
+#define INIT_ORDER_DBCORE			95
+#define INIT_ORDER_BLACKBOX			94
+#define INIT_ORDER_SERVER_MAINT		93
+#define INIT_ORDER_INPUT			85
+#define INIT_ORDER_SOUNDS			83
+#define INIT_ORDER_INSTRUMENTS		82
 #define INIT_ORDER_VIS				80
+// #define INIT_ORDER_ACHIEVEMENTS		77
 #define INIT_ORDER_RESEARCH			75
 #define INIT_ORDER_EVENTS			70
 #define INIT_ORDER_JOBS				65
 #define INIT_ORDER_QUIRKS			60
 #define INIT_ORDER_TICKER			55
-#define INIT_ORDER_INSTRUMENTS		53
+// #define INIT_ORDER_TCG				55
 #define INIT_ORDER_MAPPING			50
-#define INIT_ORDER_ECONOMY			45
-#define INIT_ORDER_NETWORKS			40
+#define INIT_ORDER_TIMETRACK		47
+#define INIT_ORDER_NETWORKS			45
+#define INIT_ORDER_ECONOMY			40
 #define INIT_ORDER_HOLODECK			35
+// #define INIT_ORDER_OUTPUTS			35
 #define INIT_ORDER_ATOMS			30
 #define INIT_ORDER_LANGUAGE			25
 #define INIT_ORDER_MACHINES			20
 #define INIT_ORDER_CIRCUIT			15
+// #define INIT_ORDER_SKILLS			15
 #define INIT_ORDER_TIMER			1
 #define INIT_ORDER_DEFAULT			0
 #define INIT_ORDER_AIR				-1
 #define INIT_ORDER_AIR_TURFS		-2
+#define INIT_ORDER_PERSISTENCE		-2 //before assets because some assets take data from SSPersistence
 #define INIT_ORDER_MINIMAP			-3
 #define INIT_ORDER_ASSETS			-4
 #define INIT_ORDER_ICON_SMOOTHING	-5
@@ -86,7 +141,9 @@
 #define INIT_ORDER_SHUTTLE			-21
 #define INIT_ORDER_MINOR_MAPPING	-40
 #define INIT_ORDER_PATH				-50
-#define INIT_ORDER_PERSISTENCE		-95
+// #define INIT_ORDER_DISCORD			-60
+// #define INIT_ORDER_EXPLOSIONS		-69
+#define INIT_ORDER_STATPANELS		-98
 #define INIT_ORDER_DEMO				-99  // o avoid a bunch of changes related to initialization being written, do this last
 #define INIT_ORDER_CHAT				-100 //Should be last to ensure chat remains smooth during init.

@@ -102,6 +159,7 @@
 #define FIRE_PRIORITY_GARBAGE		15
 #define FIRE_PRIORITY_WET_FLOORS	20
 #define FIRE_PRIORITY_AIR			20
+#define FIRE_PRIORITY_NPC			20
 #define FIRE_PRIORITY_PROCESS		25
 #define FIRE_PRIORITY_THROWING		25
 #define FIRE_PRIORITY_SPACEDRIFT	30
@@ -116,7 +174,6 @@
 #define FIRE_PRIORITY_AIR_TURFS		40
 #define FIRE_PRIORITY_DEFAULT		50
 #define FIRE_PRIORITY_PARALLAX		65
-#define FIRE_PRIORITY_NPC			80
 #define FIRE_PRIORITY_MOBS			100
 #define FIRE_PRIORITY_TGUI			110
 #define FIRE_PRIORITY_PROJECTILES	200
@@ -126,6 +183,8 @@
 #define FIRE_PRIORITY_CHAT			400
 #define FIRE_PRIORITY_RUNECHAT		410
 #define FIRE_PRIORITY_OVERLAYS		500
+// #define FIRE_PRIORITY_EXPLOSIONS	666
+#define FIRE_PRIORITY_TIMER			700
 #define FIRE_PRIORITY_INPUT			1000 // This must always always be the max highest priority. Player input must never be lost.

 // SS runlevels
@@ -138,6 +197,37 @@

 #define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME)

+
+
+//! ## Overlays subsystem
+
+///Compile all the overlays for an atom from the cache lists
+// |= on overlays is not actually guaranteed to not add same appearances but we're optimistically using it anyway.
+#define COMPILE_OVERLAYS(A)\
+	if (TRUE) {\
+		var/list/ad = A.add_overlays;\
+		var/list/rm = A.remove_overlays;\
+		if(LAZYLEN(rm)){\
+			A.overlays -= rm;\
+			rm.Cut();\
+		}\
+		if(LAZYLEN(ad)){\
+			A.overlays |= ad;\
+			ad.Cut();\
+		}\
+		A.flags_1 &= ~OVERLAY_QUEUED_1;\
+	}
+
+
+/**
+	Create a new timer and add it to the queue.
+	* Arguments:
+	* * callback the callback to call on timer finish
+	* * wait deciseconds to run the timer for
+	* * flags flags for this timer, see: code\__DEFINES\subsystems.dm
+*/
+#define addtimer(args...) _addtimer(args, file = __FILE__, line = __LINE__)
+
 // SSair run section
 #define SSAIR_PIPENETS 1
 #define SSAIR_ATMOSMACHINERY 2
@@ -148,19 +238,3 @@
 #define SSAIR_REBUILD_PIPENETS 7
 #define SSAIR_EQUALIZE 8
 #define SSAIR_ACTIVETURFS 9
-
-// |= on overlays is not actually guaranteed to not add same appearances but we're optimistically using it anyway.
-#define COMPILE_OVERLAYS(A)\
-	if (TRUE) {\
-		var/list/ad = A.add_overlays;\
-		var/list/rm = A.remove_overlays;\
-		if(LAZYLEN(rm)){\
-			A.overlays -= rm;\
-			A.remove_overlays = null;\
-		}\
-		if(LAZYLEN(ad)){\
-			A.overlays |= ad;\
-			A.add_overlays = null;\
-		}\
-		A.flags_1 &= ~OVERLAY_QUEUED_1;\
-	}
@@ -2,7 +2,7 @@
 #define APPROVAL_VOTING "APPROVAL"
 #define SCHULZE_VOTING "SCHULZE"
 #define SCORE_VOTING "SCORE"
-#define MAJORITY_JUDGEMENT_VOTING "MAJORITY_JUDGEMENT"
+#define HIGHEST_MEDIAN_VOTING "HIGHEST_MEDIAN"
 #define INSTANT_RUNOFF_VOTING "IRV"

 #define SHOW_RESULTS (1<<0)
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(vote_type_names,list(\
 "IRV (single winner ranked choice)" = INSTANT_RUNOFF_VOTING,\
 "Schulze (ranked choice, higher result=better)" = SCHULZE_VOTING,\
 "Raw Score (returns results from 0 to 1, winner is 1)" = SCORE_VOTING,\
-"Majority Judgement (single-winner score voting)" = MAJORITY_JUDGEMENT_VOTING,\
+"Highest Median (single-winner score voting)" = HIGHEST_MEDIAN_VOTING,\
 ))

 GLOBAL_LIST_INIT(display_vote_settings, list(\
@@ -1,5 +0,0 @@
-#define EXTOOLS_LOGGING // rust_g is used as a fallback if this is undefined
-
-/proc/extools_log_write()
-
-/proc/extools_finalize_logging()
@@ -37,7 +37,7 @@
 	* TYPECONT: The typepath of the contents of the list
 	* COMPARE: The object to compare against, usualy the same as INPUT
 	* COMPARISON: The variable on the objects to compare
-	* COMPTYPE: How the current bin item to compare against COMPARE is fetched. By key or value.
+	* COMPTYPE: How should the values be compared? Either COMPARE_KEY or COMPARE_VALUE.
 	*/
 #define BINARY_INSERT(INPUT, LIST, TYPECONT, COMPARE, COMPARISON, COMPTYPE) \
 	do {\
@@ -49,7 +49,7 @@
 			var/__BIN_LEFT = 1;\
 			var/__BIN_RIGHT = __BIN_CTTL;\
 			var/__BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\
-			var/##TYPECONT/__BIN_ITEM;\
+			var ##TYPECONT/__BIN_ITEM;\
 			while(__BIN_LEFT < __BIN_RIGHT) {\
 				__BIN_ITEM = COMPTYPE;\
 				if(__BIN_ITEM.##COMPARISON <= COMPARE.##COMPARISON) {\
@@ -32,7 +32,7 @@
 #define testing(msg)
 #endif

-#ifdef UNIT_TESTS
+#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM)
 /proc/log_test(text)
 	WRITE_LOG(GLOB.test_log, text)
 	SEND_TEXT(world.log, text)
@@ -86,10 +86,6 @@
 	if (CONFIG_GET(flag/log_attack))
 		WRITE_LOG(GLOB.world_attack_log, "ATTACK: [text]")

-/proc/log_wounded(text)
-	if (CONFIG_GET(flag/log_attack))
-		WRITE_LOG(GLOB.world_attack_log, "WOUND: [text]")
-
 /proc/log_manifest(ckey, datum/mind/mind,mob/body, latejoin = FALSE)
 	if (CONFIG_GET(flag/log_manifest))
 		WRITE_LOG(GLOB.world_manifest_log, "[ckey] \\ [body.real_name] \\ [mind.assigned_role] \\ [mind.special_role ? mind.special_role : "NONE"] \\ [latejoin ? "LATEJOIN":"ROUNDSTART"]")
@@ -195,6 +191,10 @@
 /proc/log_mapping(text)
 	WRITE_LOG(GLOB.world_map_error_log, text)

+/proc/log_perf(list/perf_info)
+	. = "[perf_info.Join(",")]\n"
+	WRITE_LOG_NO_FORMAT(GLOB.perf_log, .)
+
 /proc/log_reagent(text)
 	WRITE_LOG(GLOB.reagent_log, text)

@@ -238,8 +238,11 @@
 	CHECK_TICK
 	SSdbcore.SetRoundEnd()
 	//Collects persistence features
-	if(mode.allow_persistence_save)
-		SSpersistence.CollectData()
+	if(mode.station_was_nuked)
+		SSpersistence.station_was_destroyed = TRUE
+	if(!mode.allow_persistence_save)
+		SSpersistence.station_persistence_save_disabled = TRUE
+	SSpersistence.CollectData()

 	//stop collecting feedback during grifftime
 	SSblackbox.Seal()
@@ -271,7 +271,7 @@ Turf and target are separate in case you want to teleport some distance from a t
 		if(skip_mindless && (!M.mind && !M.ckey))
 			if(!isbot(M) && !iscameramob(M) && !ismegafauna(M))
 				continue
-		if(M.client && M.client.holder && M.client.holder.fakekey) //stealthmins
+		if(M.client?.holder?.fakekey && isobserver(M))
 			continue
 		var/name = avoid_assoc_duplicate_keys(M.name, namecounts)

@@ -1202,7 +1202,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
 GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)

 //Version of view() which ignores darkness, because BYOND doesn't have it (I actually suggested it but it was tagged redundant, BUT HEARERS IS A T- /rant).
-/proc/dview(var/range = world.view, var/center, var/invis_flags = 0)
+/proc/dview(range = world.view, center, invis_flags = 0)
 	if(!center)
 		return

@@ -1222,6 +1222,10 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	var/ready_to_die = FALSE

 /mob/dview/Initialize() //Properly prevents this mob from gaining huds or joining any global lists
+	SHOULD_CALL_PARENT(FALSE)
+	if(flags_1 & INITIALIZED_1)
+		stack_trace("Warning: [src]([type]) initialized multiple times!")
+	flags_1 |= INITIALIZED_1
 	return INITIALIZE_HINT_NORMAL

 /mob/dview/Destroy(force = FALSE)
@@ -46,11 +46,11 @@

 //Update this whenever you need to take advantage of more recent byond features
 #define MIN_COMPILER_VERSION 513
-#define MIN_COMPILER_BUILD 1508
+#define MIN_COMPILER_BUILD 1514
 #if DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD
 //Don't forget to update this part
 #error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update.
-#error You need version 513.1508 or higher
+#error You need version 513.1514 or higher
 #endif

 //Additional code for the above flags.
@@ -62,10 +62,14 @@
 #define FIND_REF_NO_CHECK_TICK
 #endif

-#ifdef TRAVISBUILDING
+#ifdef CIBUILDING
 #define UNIT_TESTS
 #endif

-#ifdef TRAVISTESTING
+#ifdef CITESTING
 #define TESTING
 #endif
+
+// A reasonable number of maximum overlays an object needs
+// If you think you need more, rethink it
+#define MAX_ATOM_OVERLAYS 100
@@ -0,0 +1,12 @@
+GLOBAL_LIST_EMPTY(stickybanadminexemptions)	//stores a list of ckeys exempted from a stickyban (workaround for a bug)
+GLOBAL_LIST_EMPTY(stickybanadmintexts) //stores the entire stickyban list temporarily
+GLOBAL_VAR(stickbanadminexemptiontimerid) //stores the timerid of the callback that restores all stickybans after an admin joins
+
+// /proc/init_smites() //todo: add on the second wave
+// 	var/list/smites = list()
+// 	for (var/_smite_path in subtypesof(/datum/smite))
+// 		var/datum/smite/smite_path = _smite_path
+// 		smites[initial(smite_path.name)] = smite_path
+// 	return smites
+
+// GLOBAL_LIST_INIT_TYPED(smites, /datum/smite, init_smites())
@@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))

 //LANGUAGE CHARACTER CUSTOMIZATION
 GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles"))
-GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc))
+GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien))

 //SPECIES BODYPART LISTS
 //locked parts are those that your picked species requires to have
@@ -9,5 +9,6 @@ GLOBAL_LIST_INIT(loadout_categories, list(
 	LOADOUT_CATEGORY_SHOES = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_GLOVES = LOADOUT_SUBCATEGORIES_NONE,
 	LOADOUT_CATEGORY_GLASSES = LOADOUT_SUBCATEGORIES_NONE,
-	LOADOUT_CATEGORY_DONATOR = LOADOUT_SUBCATEGORIES_NONE
+	LOADOUT_CATEGORY_DONATOR = LOADOUT_SUBCATEGORIES_NONE,
+	LOADOUT_CATEGORY_UNLOCKABLE = LOADOUT_SUBCATEGORIES_NONE
 ))
@@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/effect/spawner/lootdrop/welder_tools = 3,
 	/obj/effect/spawner/lootdrop/low_tools = 5,
 	/obj/item/relic = 3,
-	/obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 2,
+	/obj/item/weaponcrafting/receiver = 2,
 	/obj/item/clothing/head/cone = 2,
 	/obj/item/grenade/smokebomb = 2,
 	/obj/item/geiger_counter = 3,
@@ -8,6 +8,8 @@ GLOBAL_VAR(world_qdel_log)
 GLOBAL_PROTECT(world_qdel_log)
 GLOBAL_VAR(world_attack_log)
 GLOBAL_PROTECT(world_attack_log)
+// GLOBAL_VAR(world_econ_log)
+// GLOBAL_PROTECT(world_econ_log)
 GLOBAL_VAR(world_href_log)
 GLOBAL_PROTECT(world_href_log)
 GLOBAL_VAR(round_id)
@@ -26,22 +28,28 @@ GLOBAL_VAR(query_debug_log)
 GLOBAL_PROTECT(query_debug_log)
 GLOBAL_VAR(world_job_debug_log)
 GLOBAL_PROTECT(world_job_debug_log)
+// GLOBAL_VAR(world_mecha_log)
+// GLOBAL_PROTECT(world_mecha_log)
 GLOBAL_VAR(world_virus_log)
 GLOBAL_PROTECT(world_virus_log)
 GLOBAL_VAR(world_asset_log)
 GLOBAL_PROTECT(world_asset_log)
+// GLOBAL_VAR(world_cloning_log)
+// GLOBAL_PROTECT(world_cloning_log)
 GLOBAL_VAR(world_map_error_log)
 GLOBAL_PROTECT(world_map_error_log)
 GLOBAL_VAR(world_paper_log)
 GLOBAL_PROTECT(world_paper_log)
-GLOBAL_VAR(subsystem_log)
-GLOBAL_PROTECT(subsystem_log)
-GLOBAL_VAR(reagent_log)
-GLOBAL_PROTECT(reagent_log)
-GLOBAL_VAR(world_crafting_log)
-GLOBAL_PROTECT(world_crafting_log)
-GLOBAL_VAR(click_log)
-GLOBAL_PROTECT(click_log)
+GLOBAL_VAR(tgui_log)
+GLOBAL_PROTECT(tgui_log)
+GLOBAL_VAR(world_shuttle_log)
+GLOBAL_PROTECT(world_shuttle_log)
+
+GLOBAL_VAR(perf_log)
+GLOBAL_PROTECT(perf_log)
+
+// GLOBAL_VAR(demo_log)
+// GLOBAL_PROTECT(demo_log)

 GLOBAL_LIST_EMPTY(bombers)
 GLOBAL_PROTECT(bombers)
@@ -51,10 +59,7 @@ GLOBAL_LIST_EMPTY(lastsignalers)	//keeps last 100 signals here in format: "[src]
 GLOBAL_PROTECT(lastsignalers)
 GLOBAL_LIST_EMPTY(lawchanges) //Stores who uploaded laws to which silicon-based lifeform, and what the law was
 GLOBAL_PROTECT(lawchanges)
-GLOBAL_VAR(tgui_log)
-GLOBAL_PROTECT(tgui_log)
-GLOBAL_VAR(world_shuttle_log)
-GLOBAL_PROTECT(world_shuttle_log)
+
 GLOBAL_LIST_EMPTY(combatlog)
 GLOBAL_PROTECT(combatlog)
 GLOBAL_LIST_EMPTY(IClog)
@@ -75,3 +80,13 @@ GLOBAL_PROTECT(picture_logging_id)
 GLOBAL_VAR(picture_logging_prefix)
 GLOBAL_PROTECT(picture_logging_prefix)
 /////
+
+//// cit logging
+GLOBAL_VAR(subsystem_log)
+GLOBAL_PROTECT(subsystem_log)
+GLOBAL_VAR(reagent_log)
+GLOBAL_PROTECT(reagent_log)
+GLOBAL_VAR(world_crafting_log)
+GLOBAL_PROTECT(world_crafting_log)
+GLOBAL_VAR(click_log)
+GLOBAL_PROTECT(click_log)
@@ -149,6 +149,15 @@
 /obj/screen/fullscreen/color_vision/blue
 	color = "#0000ff"

+/obj/screen/fullscreen/cinematic_backdrop
+	icon = 'icons/mob/screen_gen.dmi'
+	screen_loc = "WEST,SOUTH to EAST,NORTH"
+	icon_state = "flash"
+	plane = SPLASHSCREEN_PLANE
+	layer = SPLASHSCREEN_LAYER - 1
+	color = "#000000"
+	show_when_dead = TRUE
+
 /obj/screen/fullscreen/lighting_backdrop
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "flash"
@@ -10,6 +10,8 @@
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_1(null, C.view)
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_2(null, C.view)
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/planet(null, C.view)
+		if(SSparallax.random_layer)
+			C.parallax_layers_cached += new SSparallax.random_layer
 		C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_3(null, C.view)

 	C.parallax_layers = C.parallax_layers_cached.Copy()
@@ -52,12 +54,12 @@
 		switch(C.prefs.parallax)
 			if (PARALLAX_INSANE)
 				C.parallax_throttle = FALSE
-				C.parallax_layers_max = 4
+				C.parallax_layers_max = 5
 				return TRUE

 			if (PARALLAX_MED)
 				C.parallax_throttle = PARALLAX_DELAY_MED
-				C.parallax_layers_max = 2
+				C.parallax_layers_max = 3
 				return TRUE

 			if (PARALLAX_LOW)
@@ -68,8 +70,9 @@
 			if (PARALLAX_DISABLE)
 				return FALSE

+	//This is high parallax.
 	C.parallax_throttle = PARALLAX_DELAY_DEFAULT
-	C.parallax_layers_max = 3
+	C.parallax_layers_max = 4
 	return TRUE

 /datum/hud/proc/update_parallax_pref(mob/viewmob)
@@ -219,15 +222,14 @@
 		L.screen_loc = "CENTER-7:[round(L.offset_x,1)],CENTER-7:[round(L.offset_y,1)]"

 /atom/movable/proc/update_parallax_contents()
-	set waitfor = FALSE
 	if(length(client_mobs_in_contents))
 		for(var/thing in client_mobs_in_contents)
 			var/mob/M = thing
-			if(M && M.client && M.hud_used && length(M.client.parallax_layers))
+			if(M?.client && M.hud_used && length(M.client.parallax_layers))
 				M.hud_used.update_parallax()

 /mob/proc/update_parallax_teleport()	//used for arrivals shuttle
-	if(client && client.eye && hud_used && length(client.parallax_layers))
+	if(client?.eye && hud_used && length(client.parallax_layers))
 		var/area/areaobj = get_area(client.eye)
 		hud_used.set_parallax_movedir(areaobj.parallax_movedir, TRUE)

@@ -287,6 +289,21 @@
 	speed = 1.4
 	layer = 3

+/obj/screen/parallax_layer/random
+	blend_mode = BLEND_OVERLAY
+	speed = 3
+	layer = 3
+
+/obj/screen/parallax_layer/random/space_gas
+	icon_state = "space_gas"
+
+/obj/screen/parallax_layer/random/space_gas/Initialize(mapload, view)
+	. = ..()
+	src.add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY)
+
+/obj/screen/parallax_layer/random/asteroids
+	icon_state = "asteroids"
+
 /obj/screen/parallax_layer/planet
 	icon_state = "planet"
 	blend_mode = BLEND_OVERLAY
@@ -295,11 +312,11 @@
 	layer = 30

 /obj/screen/parallax_layer/planet/update_status(mob/M)
-	var/turf/T = get_turf(M)
-	if(is_station_level(T.z))
-		invisibility = 0
-	else
-		invisibility = INVISIBILITY_ABSTRACT
+	var/client/C = M.client
+	var/turf/posobj = get_turf(C.eye)
+	if(!posobj)
+		return
+	invisibility = is_station_level(posobj.z) ? 0 : INVISIBILITY_ABSTRACT

 /obj/screen/parallax_layer/planet/update_o()
-	return //Shit wont move
+	return //Shit won't move
@@ -28,8 +28,6 @@
 	. = ..()
 	filters += filter(type="alpha", render_source=FIELD_OF_VISION_RENDER_TARGET, flags=MASK_INVERSE)

-/obj/screen/plane_master/openspace/backdrop(mob/mymob)
-	filters = list()
 	filters += filter(type = "drop_shadow", color = "#04080FAA", size = -10)
 	filters += filter(type = "drop_shadow", color = "#04080FAA", size = -15)
 	filters += filter(type = "drop_shadow", color = "#04080FAA", size = -20)
@@ -93,13 +91,6 @@
 	else
 		remove_filter("ambient_occlusion")

-//Reserved to chat messages, so they are still displayed above the field of vision masking.
-/obj/screen/plane_master/chat_messages
-	name = "chat messages plane master"
-	plane = CHAT_PLANE
-	appearance_flags = PLANE_MASTER
-	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
 ///Contains all shadow cone masks, whose image overrides are displayed only to their respective owners.
 /obj/screen/plane_master/field_of_vision
 	name = "field of vision mask plane master"
@@ -135,10 +126,14 @@
 	blend_mode = BLEND_MULTIPLY
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT

+/obj/screen/plane_master/lighting/backdrop(mob/mymob)
+	mymob.overlay_fullscreen("lighting_backdrop_lit", /obj/screen/fullscreen/lighting_backdrop/lit)
+	mymob.overlay_fullscreen("lighting_backdrop_unlit", /obj/screen/fullscreen/lighting_backdrop/unlit)
+
 /obj/screen/plane_master/lighting/Initialize()
 	. = ..()
-	filters += filter(type="alpha", render_source=EMISSIVE_RENDER_TARGET, flags=MASK_INVERSE)
-	filters += filter(type="alpha", render_source=EMISSIVE_UNBLOCKABLE_RENDER_TARGET, flags=MASK_INVERSE)
+	filters += filter(type="alpha", render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE)
+	filters += filter(type="alpha", render_source = EMISSIVE_UNBLOCKABLE_RENDER_TARGET, flags = MASK_INVERSE)

 /**
  * Things placed on this mask the lighting plane. Doesn't render directly.
@@ -186,7 +181,6 @@
 	render_target = EMISSIVE_BLOCKER_RENDER_TARGET

 ///Contains space parallax
-
 /obj/screen/plane_master/parallax
 	name = "parallax plane master"
 	plane = PLANE_SPACE_PARALLAX
@@ -197,12 +191,16 @@
 	name = "parallax whitifier plane master"
 	plane = PLANE_SPACE

-/obj/screen/plane_master/lighting/backdrop(mob/mymob)
-	mymob.overlay_fullscreen("lighting_backdrop_lit", /obj/screen/fullscreen/lighting_backdrop/lit)
-	mymob.overlay_fullscreen("lighting_backdrop_unlit", /obj/screen/fullscreen/lighting_backdrop/unlit)
-
 /obj/screen/plane_master/camera_static
 	name = "camera static plane master"
 	plane = CAMERA_STATIC_PLANE
 	appearance_flags = PLANE_MASTER
 	blend_mode = BLEND_OVERLAY
+
+
+//Reserved to chat messages, so they are still displayed above the field of vision masking.
+/obj/screen/plane_master/chat_messages
+	name = "runechat plane master"
+	plane = CHAT_PLANE
+	appearance_flags = PLANE_MASTER
+	blend_mode = BLEND_OVERLAY
@@ -12,9 +12,14 @@
 	layer = HUD_LAYER
 	plane = HUD_PLANE
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	animate_movement = SLIDE_STEPS
+	speech_span = SPAN_ROBOT
+	vis_flags = VIS_INHERIT_PLANE
 	appearance_flags = APPEARANCE_UI
-	var/obj/master = null	//A reference to the object in the slot. Grabs or items, generally.
-	var/datum/hud/hud = null // A reference to the owner HUD, if any.
+	/// A reference to the object in the slot. Grabs or items, generally.
+	var/obj/master = null
+	/// A reference to the owner HUD, if any.
+	var/datum/hud/hud = null
 	/**
 	 * Map name assigned to this object.
 	 * Automatically set by /client/proc/add_obj_to_map.
@@ -60,7 +65,17 @@
 	name = "swap hand"

 /obj/screen/swap_hand/Click()
-	usr.swap_hand()
+	// At this point in client Click() code we have passed the 1/10 sec check and little else
+	// We don't even know if it's a middle click
+	// if(world.time <= usr.next_move)
+	// 	return 1
+
+	if(usr.incapacitated())
+		return 1
+
+	if(ismob(usr))
+		var/mob/M = usr
+		M.swap_hand()
 	return 1

 /obj/screen/craft
@@ -96,17 +111,27 @@
 	H.open_language_menu(usr)

 /obj/screen/inventory
-	var/slot_id	// The indentifier for the slot. It has nothing to do with ID cards.
-	var/icon_empty // Icon when empty. For now used only by humans.
-	var/icon_full  // Icon when contains an item. For now used only by humans.
+	/// The identifier for the slot. It has nothing to do with ID cards.
+	var/slot_id
+	/// Icon when empty. For now used only by humans.
+	var/icon_empty
+	/// Icon when contains an item. For now used only by humans.
+	var/icon_full
+	/// The overlay when hovering over with an item in your hand
 	var/list/object_overlays = list()
 	layer = HUD_LAYER
 	plane = HUD_PLANE

 /obj/screen/inventory/Click(location, control, params)
-	if(hud?.mymob && (hud.mymob != usr))
-		return
-	// just redirect clicks
+	// At this point in client Click() code we have passed the 1/10 sec check and little else
+	// We don't even know if it's a middle click
+	// if(world.time <= usr.next_move)
+	// 	return TRUE
+
+	if(usr.incapacitated()) // ignore_stasis = TRUE
+		return TRUE
+	if(ismecha(usr.loc)) // stops inventory actions in a mech
+		return TRUE

 	if(hud?.mymob && slot_id)
 		var/obj/item/inv_item = hud.mymob.get_item_by_slot(slot_id)
@@ -150,12 +175,13 @@
 	var/image/item_overlay = image(holding)
 	item_overlay.alpha = 92

-	if(!user.can_equip(holding, slot_id, TRUE, TRUE, TRUE))
+	if(!user.can_equip(holding, slot_id, TRUE))
 		item_overlay.color = "#FF0000"
 	else
 		item_overlay.color = "#00ff00"

-	object_overlays += item_overlay
+	cut_overlay(object_overlays)
+	// object_overlay = item_overlay
 	add_overlay(object_overlays)

 /obj/screen/inventory/hand
@@ -187,10 +213,17 @@


 /obj/screen/inventory/hand/Click(location, control, params)
-	if(hud?.mymob && (hud.mymob != usr))
-		return
-	var/mob/user = hud.mymob
-	// just redirect clicks
+	// At this point in client Click() code we have passed the 1/10 sec check and little else
+	// We don't even know if it's a middle click
+	var/mob/user = hud?.mymob
+	if(usr != user)
+		return TRUE
+	// if(world.time <= user.next_move)
+	// 	return TRUE
+	if(user.incapacitated())
+		return TRUE
+	if (ismecha(user.loc)) // stops inventory actions in a mech
+		return TRUE

 	if(user.active_hand_index == held_index)
 		var/obj/item/I = user.get_active_held_item()
@@ -85,7 +85,7 @@
 	if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return
-	
+
 	if(!UseStaminaBufferStandard(user, STAM_COST_ATTACK_MOB_MULT, null, TRUE))
 		return DISCARD_LAST_ACTION

@@ -3,7 +3,7 @@
 	name = "Initializing..."
 	var/target

-INITIALIZE_IMMEDIATE(/obj/effect/statclick) //it's new, but rebranded.
+INITIALIZE_IMMEDIATE(/obj/effect/statclick)

 /obj/effect/statclick/Initialize(mapload, text, target) //Don't port this to Initialize it's too critical
 	. = ..()
@@ -33,14 +33,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick) //it's new, but rebranded.
 	usr.client.debug_variables(target)
 	message_admins("Admin [key_name_admin(usr)] is debugging the [target] [class].")

-/obj/effect/statclick/misc_subsystems/Click()
-	if(!usr.client.holder)
-		return
-	var/subsystem = input(usr, "Debug which subsystem?", "Debug nonprocessing subsystem") as null|anything in (Master.subsystems - Master.statworthy_subsystems)
-	if(!subsystem)
-		return
-	usr.client.debug_variables(subsystem)
-	message_admins("Admin [key_name_admin(usr)] is debugging the [subsystem] subsystem.")

 // Debug verbs.
 /client/proc/restart_controller(controller in list("Master", "Failsafe"))
@@ -566,3 +566,20 @@
 	config_entry_value = 0.333
 	min_val = 0
 	integer = FALSE
+
+/// Amount of dirtyness tiles need to spawn dirt.
+/datum/config_entry/number/turf_dirt_threshold
+	config_entry_value = 100
+	min_val = 1
+	integer = TRUE
+
+/// Alpha dirt starts at
+/datum/config_entry/number/dirt_alpha_starting
+	config_entry_value = 127
+	max_val = 255
+	min_val = 0
+	integer = TRUE
+
+/// Dirtyness multiplier for making turfs dirty
+/datum/config_entry/number/turf_dirty_multiplier
+	config_entry_value = 1
@@ -0,0 +1,20 @@
+/// Whether or not to use the persistence system for cleanable objects
+/datum/config_entry/flag/persistent_debris
+	config_entry_value = FALSE
+
+/// Whether or not to nuke all roundstart debris that isn't due to persistence if the above is true
+/datum/config_entry/flag/persistent_debris_only
+	config_entry_value = TRUE
+
+/// Max amount of objects to store, total
+/datum/config_entry/number/persistent_debris_global_max
+	config_entry_value = 10000
+	integer = TRUE
+
+/// Max amount of objects to store per type
+/datum/config_entry/number/persistent_debris_type_max
+	config_entry_value = 2000
+	integer = TRUE
+
+/// Wipe dirty stuff on nuke
+/datum/config_entry/flag/persistent_debris_wipe_on_nuke
@@ -1,7 +1,7 @@
 /**
-  * Failsafe
-  *
-  * Pretty much pokes the MC to make sure it's still alive.
+ * Failsafe
+ *
+ * Pretty much pokes the MC to make sure it's still alive.
 **/

 GLOBAL_REAL(Failsafe, /datum/controller/failsafe)
@@ -1,10 +1,10 @@
- /**
-  * StonedMC
-  *
-  * Designed to properly split up a given tick among subsystems
-  * Note: if you read parts of this code and think "why is it doing it that way"
-  * Odds are, there is a reason
-  *
+/**
+ * StonedMC
+ *
+ * Designed to properly split up a given tick among subsystems
+ * Note: if you read parts of this code and think "why is it doing it that way"
+ * Odds are, there is a reason
+ *
 **/

 //This is the ABSOLUTE ONLY THING that should init globally like this
@@ -28,8 +28,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new

 	// List of subsystems to process().
 	var/list/subsystems
-	/// List of subsystems to include in the MC stat panel.
-	var/list/statworthy_subsystems

 	// Vars for keeping track of tick drift.
 	var/init_timeofday
@@ -41,7 +39,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	///Only run ticker subsystems for the next n ticks.
 	var/skip_ticks = 0

-	var/make_runtime = 0
+	var/make_runtime = FALSE

 	var/initializations_finished_with_no_players_logged_in	//I wonder what this could be?

@@ -67,9 +65,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	//used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits
 	var/static/current_ticklimit = TICK_LIMIT_RUNNING

-	/// Statclick for misc subsystems
-	var/obj/effect/statclick/misc_subsystems/misc_statclick
-
 /datum/controller/master/New()
 	if(!config)
 		config = new
@@ -96,11 +91,6 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 				_subsystems += new I
 		Master = src

-	// We want to see all subsystems during init.
-	statworthy_subsystems = subsystems.Copy()
-
-	misc_statclick = new(null, "Debug")
-
 	if(!GLOB)
 		new /datum/controller/global_vars

@@ -217,7 +207,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	// Sort subsystems by display setting for easy access.
 	sortTim(subsystems, /proc/cmp_subsystem_display)
 	// Set world options.
-	world.fps = CONFIG_GET(number/fps)
+	world.change_fps(CONFIG_GET(number/fps))
 	var/initialized_tod = REALTIMEOFDAY

 	if(tgs_prime)
@@ -271,14 +261,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/list/tickersubsystems = list()
 	var/list/runlevel_sorted_subsystems = list(list())	//ensure we always have at least one runlevel
 	var/timer = world.time
-	statworthy_subsystems = list()
 	for (var/thing in subsystems)
 		var/datum/controller/subsystem/SS = thing
 		if (SS.flags & SS_NO_FIRE)
-			if(SS.flags & SS_ALWAYS_SHOW_STAT)
-				statworthy_subsystems += SS
 			continue
-		statworthy_subsystems += SS
 		SS.queued_time = 0
 		SS.queue_next = null
 		SS.queue_prev = null
@@ -23,7 +23,7 @@
 	var/priority = FIRE_PRIORITY_DEFAULT

 	/// [Subsystem Flags][SS_NO_INIT] to control binary behavior. Flags must be set at compile time or before preinit finishes to take full effect. (You can also restart the mc to force them to process again)
-	var/flags = 0
+	var/flags = NONE

 	/// This var is set to TRUE after the subsystem has been initialized.
 	var/initialized = FALSE
@@ -114,7 +114,7 @@
 //previously, this would have been named 'process()' but that name is used everywhere for different things!
 //fire() seems more suitable. This is the procedure that gets called every 'wait' deciseconds.
 //Sleeping in here prevents future fires until returned.
-/datum/controller/subsystem/proc/fire(resumed = 0)
+/datum/controller/subsystem/proc/fire(resumed = FALSE)
 	flags |= SS_NO_FIRE
 	CRASH("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.")

@@ -241,7 +241,8 @@ SUBSYSTEM_DEF(air)
 			return

 /datum/controller/subsystem/air/proc/process_turf_equalize(resumed = 0)
-	return process_turf_equalize_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag)
+	if(process_turf_equalize_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag))
+		pause()
 	/*
 	//cache for sanic speed
 	var/fire_count = times_fired
@@ -260,7 +261,8 @@ SUBSYSTEM_DEF(air)
 	*/

 /datum/controller/subsystem/air/proc/process_active_turfs(resumed = 0)
-	return process_active_turfs_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag)
+	if(process_active_turfs_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag))
+		pause()
 	/*
 	//cache for sanic speed
 	var/fire_count = times_fired
@@ -278,7 +280,8 @@ SUBSYSTEM_DEF(air)
 	*/

 /datum/controller/subsystem/air/proc/process_excited_groups(resumed = 0)
-	return process_excited_groups_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag)
+	if(process_excited_groups_extools(resumed, (Master.current_ticklimit - TICK_USAGE) * 0.01 * world.tick_lag))
+		pause()
 	/*
 	if (!resumed)
 		src.currentrun = excited_groups.Copy()
@@ -11,7 +11,7 @@ SUBSYSTEM_DEF(assets)
 	switch (CONFIG_GET(string/asset_transport))
 		if ("webroot")
 			newtransporttype = /datum/asset_transport/webroot
-	
+
 	if (newtransporttype == transport.type)
 		return

@@ -10,33 +10,37 @@ SUBSYSTEM_DEF(atoms)

 	var/old_initialized

-	var/list/late_loaders
+	var/list/late_loaders = list()

 	var/list/BadInitializeCalls = list()

+	initialized = INITIALIZATION_INSSATOMS
+
 /datum/controller/subsystem/atoms/Initialize(timeofday)
 	GLOB.fire_overlay.appearance_flags = RESET_COLOR
-	setupGenetics()
+	setupGenetics() //to set the mutations' sequence
+
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 	InitializeAtoms()
+	initialized = INITIALIZATION_INNEW_REGULAR
 	return ..()

 /datum/controller/subsystem/atoms/proc/InitializeAtoms(list/atoms)
 	if(initialized == INITIALIZATION_INSSATOMS)
 		return

+	old_initialized = initialized
 	initialized = INITIALIZATION_INNEW_MAPLOAD

-	LAZYINITLIST(late_loaders)
-
 	var/count
 	var/list/mapload_arg = list(TRUE)
+
 	if(atoms)
 		count = atoms.len
-		for(var/I in atoms)
-			var/atom/A = I
+		for(var/I in 1 to count)
+			var/atom/A = atoms[I]
 			if(!(A.flags_1 & INITIALIZED_1))
-				InitAtom(I, mapload_arg)
+				InitAtom(A, mapload_arg)
 				CHECK_TICK
 	else
 		count = 0
@@ -49,15 +53,16 @@ SUBSYSTEM_DEF(atoms)
 	testing("Initialized [count] atoms")
 	pass(count)

-	initialized = INITIALIZATION_INNEW_REGULAR
+	initialized = old_initialized

 	if(late_loaders.len)
-		for(var/I in late_loaders)
-			var/atom/A = I
+		for(var/I in 1 to late_loaders.len)
+			var/atom/A = late_loaders[I]
 			A.LateInitialize()
 		testing("Late initialized [late_loaders.len] atoms")
 		late_loaders.Cut()

+/// Init this specific atom
 /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments)
 	var/the_type = A.type
 	if(QDELING(A))
@@ -150,8 +155,3 @@ SUBSYSTEM_DEF(atoms)
 	var/initlog = InitLog()
 	if(initlog)
 		text2file(initlog, "[GLOB.log_directory]/initialize.log")
-
-#undef BAD_INIT_QDEL_BEFORE
-#undef BAD_INIT_DIDNT_INIT
-#undef BAD_INIT_SLEPT
-#undef BAD_INIT_NO_HINT
@@ -115,7 +115,6 @@ SUBSYSTEM_DEF(blackbox)

 	SSdbcore.MassInsert(format_table_name("feedback"), sqlrowlist, ignore_errors = TRUE, delayed = TRUE, special_columns = special_columns)

-
 /datum/controller/subsystem/blackbox/proc/Seal()
 	if(sealed)
 		return FALSE
@@ -285,6 +284,18 @@ Versioning
 /datum/feedback_variable/New(new_key, new_key_type)
 	key = new_key
 	key_type = new_key_type
+/*
+/datum/controller/subsystem/blackbox/proc/LogAhelp(ticket, action, message, recipient, sender)
+	if(!SSdbcore.Connect())
+		return
+
+	var/datum/db_query/query_log_ahelp = SSdbcore.NewQuery({"
+		INSERT INTO [format_table_name("ticket")] (ticket, action, message, recipient, sender, server_ip, server_port, round_id, timestamp)
+		VALUES (:ticket, :action, :message, :recipient, :sender, INET_ATON(:server_ip), :server_port, :round_id, :time)
+	"}, list("ticket" = ticket, "action" = action, "message" = message, "recipient" = recipient, "sender" = sender, "server_ip" = world.internet_address || "0", "server_port" = world.port, "round_id" = GLOB.round_id, "time" = SQLtime()))
+	query_log_ahelp.Execute()
+	qdel(query_log_ahelp)
+*/

 /datum/controller/subsystem/blackbox/proc/LogAhelp(ticket, action, message, recipient, sender)
 	if(!SSdbcore.Connect())
@@ -1,4 +1,4 @@
-/**
+/*!
 * Copyright (c) 2020 Aleksej Komarov
 * SPDX-License-Identifier: MIT
 */
@@ -202,6 +202,25 @@ SUBSYSTEM_DEF(dbcore)



+/datum/controller/subsystem/dbcore/proc/QuerySelect(list/querys, warn = FALSE, qdel = FALSE)
+	if (!islist(querys))
+		if (!istype(querys, /datum/DBQuery))
+			CRASH("Invalid query passed to QuerySelect: [querys]")
+		querys = list(querys)
+
+	for (var/thing in querys)
+		var/datum/DBQuery/query = thing
+		if (warn)
+			INVOKE_ASYNC(query, /datum/DBQuery.proc/warn_execute)
+		else
+			INVOKE_ASYNC(query, /datum/DBQuery.proc/Execute)
+
+	for (var/thing in querys)
+		var/datum/DBQuery/query = thing
+		UNTIL(!query.in_progress)
+		if (qdel)
+			qdel(query)
+
 /*
 Takes a list of rows (each row being an associated list of column => value) and inserts them via a single mass query.
 Rows missing columns present in other rows will resolve to SQL NULL
@@ -25,7 +25,7 @@ SUBSYSTEM_DEF(events)
 	return ..()


-/datum/controller/subsystem/events/fire(resumed = 0)
+/datum/controller/subsystem/events/fire(resumed = FALSE)
 	if(!resumed)
 		checkEvent() //only check these if we aren't resuming a paused fire
 		src.currentrun = running.Copy()
@@ -37,7 +37,7 @@ SUBSYSTEM_DEF(events)
 		var/datum/thing = currentrun[currentrun.len]
 		currentrun.len--
 		if(thing)
-			thing.process()
+			thing.process(wait * 0.1)
 		else
 			running.Remove(thing)
 		if (MC_TICK_CHECK)
@@ -91,13 +91,13 @@ SUBSYSTEM_DEF(events)
 	if(. == EVENT_CANT_RUN)//we couldn't run this event for some reason, set its max_occurrences to 0
 		E.max_occurrences = 0
 	else if(. == EVENT_READY)
-		E.random = TRUE
-		E.runEvent(TRUE)
+		E.runEvent(random = TRUE)

 //allows a client to trigger an event
 //aka Badmin Central
 // > Not in modules/admin
 // REEEEEEEEE
+// Why the heck is this here! Took me so damn long to find!
 /client/proc/forceEvent()
 	set name = "Trigger Event"
 	set category = "Admin.Events"
@@ -18,6 +18,7 @@ SUBSYSTEM_DEF(fire_burning)

 	//cache for sanic speed (lists are references anyways)
 	var/list/currentrun = src.currentrun
+	var/delta_time = wait * 0.1

 	while(currentrun.len)
 		var/obj/O = currentrun[currentrun.len]
@@ -28,10 +29,12 @@ SUBSYSTEM_DEF(fire_burning)
 				return
 			continue

-		if(O.resistance_flags & ON_FIRE)
-			O.take_damage(20, BURN, "fire", 0)
-		else
-			processing -= O
+
+		if(O.resistance_flags & ON_FIRE) //in case an object is extinguished while still in currentrun
+			if(!(O.resistance_flags & FIRE_PROOF))
+				O.take_damage(10 * delta_time, BURN, "fire", 0)
+			else
+				O.extinguish()

 		if (MC_TICK_CHECK)
 			return
@@ -1,3 +1,26 @@
+/*!
+## Debugging GC issues
+
+In order to debug `qdel()` failures, there are several tools available.
+To enable these tools, define `TESTING` in [_compile_options.dm](https://github.com/tgstation/-tg-station/blob/master/code/_compile_options.dm).
+
+First is a verb called "Find References", which lists **every** refererence to an object in the world. This allows you to track down any indirect or obfuscated references that you might have missed.
+
+Complementing this is another verb, "qdel() then Find References".
+This does exactly what you'd expect; it calls `qdel()` on the object and then it finds all references remaining.
+This is great, because it means that `Destroy()` will have been called before it starts to find references,
+so the only references you'll find will be the ones preventing the object from `qdel()`ing gracefully.
+
+If you have a datum or something you are not destroying directly (say via the singulo),
+the next tool is `QDEL_HINT_FINDREFERENCE`. You can return this in `Destroy()` (where you would normally `return ..()`),
+to print a list of references once it enters the GC queue.
+
+Finally is a verb, "Show qdel() Log", which shows the deletion log that the garbage subsystem keeps. This is helpful if you are having race conditions or need to review the order of deletions.
+
+Note that for any of these tools to work `TESTING` must be defined.
+By using these methods of finding references, you can make your life far, far easier when dealing with `qdel()` failures.
+*/
+
 SUBSYSTEM_DEF(garbage)
 	name = "Garbage"
 	priority = FIRE_PRIORITY_GARBAGE
@@ -6,7 +29,7 @@ SUBSYSTEM_DEF(garbage)
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 	init_order = INIT_ORDER_GARBAGE

-	var/list/collection_timeout = list(15 SECONDS, 30 SECONDS)	// deciseconds to wait before moving something up in the queue to the next level
+	var/list/collection_timeout = list(2 MINUTES, 10 SECONDS)	// deciseconds to wait before moving something up in the queue to the next level

 	//Stat tracking
 	var/delslasttick = 0			// number of del()'s we've done this tick
@@ -24,10 +47,8 @@ SUBSYSTEM_DEF(garbage)

 	//Queue
 	var/list/queues
-
 	#ifdef LEGACY_REFERENCE_TRACKING
 	var/list/reference_find_on_fail = list()
-	var/list/reference_find_on_fail_types = list()
 	#endif


@@ -99,6 +120,9 @@ SUBSYSTEM_DEF(garbage)
 					state = SS_RUNNING
 				break

+
+
+
 /datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_CHECK)
 	if (level == GC_QUEUE_CHECK)
 		delslasttick = 0
@@ -115,18 +139,22 @@ SUBSYSTEM_DEF(garbage)

 	lastlevel = level

-	for (var/refID in queue)
-		if (!refID)
+	//We do this rather then for(var/refID in queue) because that sort of for loop copies the whole list.
+	//Normally this isn't expensive, but the gc queue can grow to 40k items, and that gets costly/causes overrun.
+	for (var/i in 1 to length(queue))
+		var/list/L = queue[i]
+		if (length(L) < 2)
 			count++
 			if (MC_TICK_CHECK)
 				return
 			continue

-		var/GCd_at_time = queue[refID]
+		var/GCd_at_time = L[1]
 		if(GCd_at_time > cut_off_time)
 			break // Everything else is newer, skip them
 		count++

+		var/refID = L[2]
 		var/datum/D
 		D = locate(refID)

@@ -135,7 +163,7 @@ SUBSYSTEM_DEF(garbage)
 			++totalgcs
 			pass_counts[level]++
 			#ifdef LEGACY_REFERENCE_TRACKING
-			reference_find_on_fail -= refID		//It's deleted we don't care anymore.
+			reference_find_on_fail -= refID	//It's deleted we don't care anymore.
 			#endif
 			if (MC_TICK_CHECK)
 				return
@@ -149,10 +177,10 @@ SUBSYSTEM_DEF(garbage)
 				D.find_references()
 				#elif defined(LEGACY_REFERENCE_TRACKING)
 				if(reference_find_on_fail[refID])
-					D.find_references()
+					D.find_references_legacy()
 				#ifdef GC_FAILURE_HARD_LOOKUP
 				else
-					D.find_references()
+					D.find_references_legacy()
 				#endif
 				reference_find_on_fail -= refID
 				#endif
@@ -186,27 +214,6 @@ SUBSYSTEM_DEF(garbage)
 		queue.Cut(1,count+1)
 		count = 0

-/datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_CHECK)
-	if (isnull(D))
-		return
-	if (level > GC_QUEUE_COUNT)
-		HardDelete(D)
-		return
-	var/gctime = world.time
-	var/refid = "\ref[D]"
-
-#ifdef LEGACY_REFERENCE_TRACKING
-	if(reference_find_on_fail_types[D.type])
-		reference_find_on_fail["\ref[D]"] = TRUE
-#endif
-
-	D.gc_destroyed = gctime
-	var/list/queue = queues[level]
-	if (queue[refid])
-		queue -= refid // Removing any previous references that were GC'd so that the current object will be at the end of the list.
-
-	queue[refid] = gctime
-
 #ifdef LEGACY_REFERENCE_TRACKING
 /datum/controller/subsystem/garbage/proc/add_type_to_findref(type)
 	if(!ispath(type))
@@ -222,6 +229,24 @@ SUBSYSTEM_DEF(garbage)
 	reference_find_on_fail_types = list()
 #endif

+/datum/controller/subsystem/garbage/proc/Queue(datum/D, level = GC_QUEUE_CHECK)
+	if (isnull(D))
+		return
+	if (level > GC_QUEUE_COUNT)
+		HardDelete(D)
+		return
+	var/gctime = world.time
+	var/refid = "\ref[D]"
+
+#ifdef LEGACY_REFERENCE_TRACKING
+	if(reference_find_on_fail_types[D.type])
+		SSgarbage.reference_find_on_fail[REF(D)] = TRUE
+#endif
+
+	D.gc_destroyed = gctime
+	var/list/queue = queues[level]
+	queue[++queue.len] = list(gctime, refid) // not += for byond reasons
+
 //this is mainly to separate things profile wise.
 /datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
 	var/time = world.timeofday
@@ -274,8 +299,10 @@ SUBSYSTEM_DEF(garbage)
 /datum/qdel_item/New(mytype)
 	name = "[mytype]"

-// Should be treated as a replacement for the 'del' keyword.
-// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
+
+/// Should be treated as a replacement for the 'del' keyword.
+///
+/// Datums passed to this will be given a chance to clean up references to allow the GC to collect them.
 /proc/qdel(datum/D, force=FALSE, ...)
 	if(!istype(D))
 		del(D)
@@ -330,9 +357,10 @@ SUBSYSTEM_DEF(garbage)
 			#ifdef LEGACY_REFERENCE_TRACKING
 			if (QDEL_HINT_FINDREFERENCE) //qdel will, if LEGACY_REFERENCE_TRACKING is enabled, display all references to this object, then queue the object for deletion.
 				SSgarbage.Queue(D)
+				D.find_references_legacy()
 			if (QDEL_HINT_IFFAIL_FINDREFERENCE)
 				SSgarbage.Queue(D)
-				SSgarbage.reference_find_on_fail["\ref[D]"] = TRUE
+				SSgarbage.reference_find_on_fail[REF(D)] = TRUE
 			#endif
 			else
 				#ifdef TESTING
@@ -33,8 +33,9 @@ SUBSYSTEM_DEF(idlenpcpool)
 	while(currentrun.len)
 		var/mob/living/simple_animal/SA = currentrun[currentrun.len]
 		--currentrun.len
-		if (!SA)
+		if (QDELETED(SA))
 			GLOB.simple_animals[AI_IDLE] -= SA
+			log_world("Found a null in simple_animals list!")
 			continue

 		if(!SA.ckey)
@@ -2,13 +2,13 @@ SUBSYSTEM_DEF(ipintel)
 	name = "XKeyScore"
 	init_order = INIT_ORDER_XKEYSCORE
 	flags = SS_NO_FIRE
-	var/enabled = 0 //disable at round start to avoid checking reconnects
+	var/enabled = FALSE //disable at round start to avoid checking reconnects
 	var/throttle = 0
 	var/errors = 0

 	var/list/cache = list()

 /datum/controller/subsystem/ipintel/Initialize(timeofday, zlevel)
-	enabled = 1
+	enabled = TRUE
 	. = ..()

@@ -698,6 +698,8 @@ SUBSYSTEM_DEF(job)
 					if(polychromic && istype(polychromic))
 						var/list/polychromic_entry = polychromic.colors_by_atom[I]
 						if(polychromic_entry)
+							if(polychromic.suits_with_helmet_typecache[I.type]) //is this one of those toggleable hood/helmet things?
+								polychromic.connect_helmet(I,i[LOADOUT_COLOR])
 							polychromic.colors_by_atom[I] = i[LOADOUT_COLOR]
 							I.update_icon()
 				else
@@ -94,8 +94,8 @@ SUBSYSTEM_DEF(jukeboxes)
 			stack_trace("Nonexistant or invalid object associated with jukebox.")
 			continue
 		var/sound/song_played = sound(juketrack.song_path)
-		var/area/currentarea = get_area(jukebox)
 		var/turf/currentturf = get_turf(jukebox)
+		var/area/currentarea = get_area(jukebox)
 		var/list/hearerscache = hearers(7, jukebox)

 		song_played.falloff = jukeinfo[4]
@@ -116,7 +116,6 @@ SUBSYSTEM_DEF(jukeboxes)
 					inrange = TRUE
 			else
 				song_played.status = SOUND_MUTE | SOUND_UPDATE	//Setting volume = 0 doesn't let the sound properties update at all, which is lame.
-
 			M.playsound_local(currentturf, null, 100, channel = jukeinfo[2], S = song_played, envwet = (inrange ? -250 : 0), envdry = (inrange ? 0 : -10000))
 			CHECK_TICK
 	return
@@ -6,6 +6,7 @@ SUBSYSTEM_DEF(lighting)
 	name = "Lighting"
 	wait = 2
 	init_order = INIT_ORDER_LIGHTING
+	flags = SS_TICKER

 /datum/controller/subsystem/lighting/stat_entry(msg)
 	msg = "L:[length(GLOB.lighting_update_lights)]|C:[length(GLOB.lighting_update_corners)]|O:[length(GLOB.lighting_update_objects)]"
@@ -2,6 +2,7 @@ SUBSYSTEM_DEF(machines)
 	name = "Machines"
 	init_order = INIT_ORDER_MACHINES
 	flags = SS_KEEP_TIMING
+	wait = 2 SECONDS
 	var/list/processing = list()
 	var/list/currentrun = list()
 	var/list/powernets = list()
@@ -27,7 +28,7 @@ SUBSYSTEM_DEF(machines)
 	return ..()


-/datum/controller/subsystem/machines/fire(resumed = 0)
+/datum/controller/subsystem/machines/fire(resumed = FALSE)
 	if (!resumed)
 		for(var/datum/powernet/Powernet in powernets)
 			Powernet.reset() //reset the power state.
@@ -36,11 +37,10 @@ SUBSYSTEM_DEF(machines)
 	//cache for sanic speed (lists are references anyways)
 	var/list/currentrun = src.currentrun

-	var/seconds = wait * 0.1
 	while(currentrun.len)
 		var/obj/machinery/thing = currentrun[currentrun.len]
 		currentrun.len--
-		if(!QDELETED(thing) && thing.process(seconds) != PROCESS_KILL)
+		if(!QDELETED(thing) && thing.process(wait * 0.1) != PROCESS_KILL)
 			if(thing.use_power)
 				thing.auto_use_power() //add back the power state
 		else
@@ -41,6 +41,8 @@ SUBSYSTEM_DEF(mapping)
 	var/datum/space_level/transit
 	var/datum/space_level/empty_space
 	var/num_of_res_levels = 1
+	/// Lookup for zlevel to station z. text = num.
+	var/list/z_to_station_z_index

 	var/stat_map_name = "Loading..."

@@ -259,6 +261,16 @@ SUBSYSTEM_DEF(mapping)
 		INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
 	return parsed_maps

+/datum/controller/subsystem/mapping/proc/setup_station_z_index()
+	z_to_station_z_index = list()
+	var/sz = 1
+	var/cz = station_start
+	if(islist(config.map_file))
+		for(var/map in config.map_file)
+			z_to_station_z_index["[cz++]"] = sz++
+	else
+		z_to_station_z_index["[station_start]"] = 1
+
 /datum/controller/subsystem/mapping/proc/loadWorld()
 	//if any of these fail, something has gone horribly, HORRIBLY, wrong
 	var/list/FailedZs = list()
@@ -271,6 +283,8 @@ SUBSYSTEM_DEF(mapping)
 	INIT_ANNOUNCE("Loading [config.map_name]...")
 	LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION, FALSE, config.orientation)

+	setup_station_z_index()
+
 	if(SSdbcore.Connect())
 		var/datum/db_query/query_round_map_name = SSdbcore.NewQuery({"
 			UPDATE [format_table_name("round")] SET map_name = :map_name WHERE id = :round_id
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(min_spawns)
 	name = "Minimum Spawns" /// this hot steaming pile of garbage makes sure theres a minimum of tendrils scattered around
 	init_order = INIT_ORDER_DEFAULT
-	flags = SS_BACKGROUND | SS_NO_FIRE | SS_ALWAYS_SHOW_STAT
+	flags = SS_BACKGROUND | SS_NO_FIRE
 	wait = 2
 	var/where_we_droppin_boys_iterations = 0
 	var/snaxi_snowflake_check = FALSE
@@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(minimum_snow_under_spawns, list(
 					continue
 				if(typesof(/turf/open/lava) in orange(9, TT))
 					continue
-				valid_mining_turfs_2.Add(TT)	
+				valid_mining_turfs_2.Add(TT)
 	else
 		for(var/z_level in SSmapping.levels_by_trait(ZTRAIT_LAVA_RUINS))
 			for(var/turf/TT in Z_TURFS(z_level))
@@ -103,14 +103,14 @@ GLOBAL_LIST_INIT(minimum_snow_under_spawns, list(
 		for(var/mob/living/simple_animal/hostile/megafauna/H in urange(70,RT)) //prevents mob clumps
 			if((istype(MS_tospawn, /mob/living/simple_animal/hostile/megafauna)) && get_dist(RT, H) <= 70)
 				active_spawns.Add(MS_tospawn)
-				continue //let's try not to dump megas too close to each other?	
+				continue //let's try not to dump megas too close to each other?
 			if((istype(MS_tospawn, /obj/structure/spawner)) && get_dist(RT, H) <= 40)
 				active_spawns.Add(MS_tospawn)
 				continue //let's at least /try/ to space these out?
 		for(var/obj/structure/spawner/LT in urange(70,RT)) //prevents tendril/mega clumps
 			if((istype(MS_tospawn, /mob/living/simple_animal/hostile/megafauna)) && get_dist(RT, LT) <= 70)
 				active_spawns.Add(MS_tospawn)
-				continue //let's try not to dump megas too close to each other?	
+				continue //let's try not to dump megas too close to each other?
 			if((istype(MS_tospawn, /obj/structure/spawner)) && get_dist(RT, LT) <= 40)
 				active_spawns.Add(MS_tospawn)
 				continue //let's at least /try/ to space these out?
@@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(minimum_snow_under_spawns, list(
 		for(var/mob/living/simple_animal/hostile/H in urange(70,RT2)) //prevents mob clumps
 			if((istype(MS2_tospawn, /mob/living/simple_animal/hostile/megafauna) || ismegafauna(H)) && get_dist(RT2, H) <= 70)
 				active_spawns_2.Add(MS2_tospawn)
-				continue //let's try not to dump megas too close to each other?	
+				continue //let's try not to dump megas too close to each other?
 			if((istype(MS2_tospawn, /obj/structure/spawner)) && get_dist(RT2, H) <= 40)
 				active_spawns_2.Add(MS2_tospawn)
 				continue //let's at least /try/ to space these out?
@@ -1,3 +1,5 @@
+#define PROB_MOUSE_SPAWN 98
+
 SUBSYSTEM_DEF(minor_mapping)
 	name = "Minor Mapping"
 	init_order = INIT_ORDER_MINOR_MAPPING
@@ -5,29 +7,43 @@ SUBSYSTEM_DEF(minor_mapping)

 /datum/controller/subsystem/minor_mapping/Initialize(timeofday)
 	trigger_migration(CONFIG_GET(number/mice_roundstart))
+	// place_satchels()
 	return ..()

 /datum/controller/subsystem/minor_mapping/proc/trigger_migration(num_mice=10)
 	var/list/exposed_wires = find_exposed_wires()

-	var/mob/living/simple_animal/mouse/M
+	var/mob/living/simple_animal/mouse/mouse
 	var/turf/proposed_turf

 	while((num_mice > 0) && exposed_wires.len)
 		proposed_turf = pick_n_take(exposed_wires)
-		if(!M)
-			M = new(proposed_turf)
-		else
-			M.forceMove(proposed_turf)
-		if(M.environment_is_safe())
-			num_mice -= 1
-			M = null
+		if(prob(PROB_MOUSE_SPAWN))
+			if(!mouse)
+				mouse = new(proposed_turf)
+			else
+				mouse.forceMove(proposed_turf)
+		// else
+		// 	mouse = new /mob/living/simple_animal/hostile/regalrat/controlled(proposed_turf)
+			if(mouse.environment_is_safe())
+				num_mice -= 1
+				mouse = null
+
+// /datum/controller/subsystem/minor_mapping/proc/place_satchels(amount=10)
+// 	var/list/turfs = find_satchel_suitable_turfs()
+
+// 	while(turfs.len && amount > 0)
+// 		var/turf/T = pick_n_take(turfs)
+// 		var/obj/item/storage/backpack/satchel/flat/F = new(T)
+
+// 		SEND_SIGNAL(F, COMSIG_OBJ_HIDE, T.intact)
+// 		amount--

 /proc/find_exposed_wires()
 	var/list/exposed_wires = list()
-	exposed_wires.Cut()
+
 	var/list/all_turfs
-	for (var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
 		all_turfs += block(locate(1,1,z), locate(world.maxx,world.maxy,z))
 	for(var/turf/open/floor/plating/T in all_turfs)
 		if(is_blocked_turf(T))
@@ -36,3 +52,15 @@ SUBSYSTEM_DEF(minor_mapping)
 			exposed_wires += T

 	return shuffle(exposed_wires)
+
+// /proc/find_satchel_suitable_turfs()
+// 	var/list/suitable = list()
+
+// 	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+// 		for(var/t in block(locate(1,1,z), locate(world.maxx,world.maxy,z)))
+// 			if(isfloorturf(t) && !isplatingturf(t))
+// 				suitable += t
+
+// 	return shuffle(suitable)
+
+#undef PROB_MOUSE_SPAWN
@@ -48,9 +48,16 @@ SUBSYSTEM_DEF(overlays)
 	for (var/thing in queue)
 		count++
 		if(thing)
-			STAT_START_STOPWATCH
 			var/atom/A = thing
+			if(A.overlays.len >= MAX_ATOM_OVERLAYS)
+				//Break it real GOOD
+				stack_trace("Too many overlays on [A.type] - [A.overlays.len], refusing to update and cutting")
+				A.overlays.Cut()
+				continue
+			STAT_START_STOPWATCH
 			COMPILE_OVERLAYS(A)
+			UNSETEMPTY(A.add_overlays)
+			UNSETEMPTY(A.remove_overlays)
 			STAT_STOP_STOPWATCH
 			STAT_LOG_ENTRY(stats, A.type)
 		if(mc_check)
@@ -117,9 +124,8 @@ SUBSYSTEM_DEF(overlays)
 #define QUEUE_FOR_COMPILE flags_1 |= OVERLAY_QUEUED_1; SSoverlays.queue += src;
 /atom/proc/cut_overlays()
 	LAZYINITLIST(remove_overlays)
-	LAZYINITLIST(add_overlays)
 	remove_overlays = overlays.Copy()
-	add_overlays.Cut()
+	add_overlays = null

 	//If not already queued for work and there are overlays to remove
 	if(NOT_QUEUED_ALREADY && remove_overlays.len)
@@ -129,7 +135,7 @@ SUBSYSTEM_DEF(overlays)
 	if(!overlays)
 		return
 	overlays = build_appearance_list(overlays)
-	LAZYINITLIST(add_overlays) //always initialized after this point
+	LAZYINITLIST(add_overlays)
 	LAZYINITLIST(remove_overlays)
 	var/a_len = add_overlays.len
 	var/r_len = remove_overlays.len
@@ -140,8 +146,9 @@ SUBSYSTEM_DEF(overlays)
 	var/fr_len = remove_overlays.len

 	//If not already queued and there is work to be done
-	if(NOT_QUEUED_ALREADY && (fa_len != a_len || fr_len != r_len))
+	if(NOT_QUEUED_ALREADY && (fa_len != a_len || fr_len != r_len ))
 		QUEUE_FOR_COMPILE
+	UNSETEMPTY(add_overlays)

 /atom/proc/add_overlay(list/overlays)
 	if(!overlays)
@@ -7,13 +7,21 @@ SUBSYSTEM_DEF(parallax)
 	var/list/currentrun
 	var/planet_x_offset = 128
 	var/planet_y_offset = 128
+	var/random_layer
+	var/random_parallax_color

-/datum/controller/subsystem/parallax/Initialize(timeofday)
+
+//These are cached per client so needs to be done asap so people joining at roundstart do not miss these.
+/datum/controller/subsystem/parallax/PreInit()
 	. = ..()
+	if(prob(70))	//70% chance to pick a special extra layer
+		random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids)
+		random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color. [COLOR_SILVER]
 	planet_y_offset = rand(100, 160)
 	planet_x_offset = rand(100, 160)

-/datum/controller/subsystem/parallax/fire(resumed = 0)
+
+/datum/controller/subsystem/parallax/fire(resumed = FALSE)
 	if (!resumed)
 		src.currentrun = GLOB.clients.Copy()

@@ -21,24 +29,27 @@ SUBSYSTEM_DEF(parallax)
 	var/list/currentrun = src.currentrun

 	while(length(currentrun))
-		var/client/C = currentrun[currentrun.len]
+		var/client/processing_client = currentrun[currentrun.len]
 		currentrun.len--
-		if (!C || !C.eye)
+		if (QDELETED(processing_client) || !processing_client.eye)
 			if (MC_TICK_CHECK)
 				return
 			continue
-		var/atom/movable/A = C.eye
-		if(!istype(A))
-			continue
-		for (A; isloc(A.loc) && !isturf(A.loc); A = A.loc);

-		if(A != C.movingmob)
-			if(C.movingmob != null)
-				C.movingmob.client_mobs_in_contents -= C.mob
-				UNSETEMPTY(C.movingmob.client_mobs_in_contents)
-			LAZYINITLIST(A.client_mobs_in_contents)
-			A.client_mobs_in_contents += C.mob
-			C.movingmob = A
+		var/atom/movable/movable_eye = processing_client.eye
+		if(!istype(movable_eye))
+			continue
+
+		for (movable_eye; isloc(movable_eye.loc) && !isturf(movable_eye.loc); movable_eye = movable_eye.loc);
+
+		if(movable_eye == processing_client.movingmob)
+			if (MC_TICK_CHECK)
+				return
+			continue
+		if(!isnull(processing_client.movingmob))
+			LAZYREMOVE(processing_client.movingmob.client_mobs_in_contents, processing_client.mob)
+		LAZYADD(movable_eye.client_mobs_in_contents, processing_client.mob)
+		processing_client.movingmob = movable_eye
 		if (MC_TICK_CHECK)
 			return
 	currentrun = null
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(pathfinder)
 	var/free
 	var/list/flow

-/datum/flowcache/New(var/n)
+/datum/flowcache/New(n)
 	. = ..()
 	lcount = n
 	run = 0
@@ -5,18 +5,14 @@ SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
 	init_order = INIT_ORDER_PERSISTENCE
 	flags = SS_NO_FIRE
-	var/list/satchel_blacklist 		= list() //this is a typecache
-	var/list/new_secret_satchels 	= list() //these are objects
-	var/list/old_secret_satchels 	= list()
+
+	/// Marks if the station got horribly destroyed
+	var/station_was_destroyed = FALSE
+	/// Marks if persistence save should be disabled
+	var/station_persistence_save_disabled = FALSE

 	var/list/obj/structure/chisel_message/chisel_messages = list()
 	var/list/saved_messages = list()
-	var/list/saved_modes = list(1,2,3)
-	var/list/saved_dynamic_rules = list(list(),list(),list())
-	var/list/saved_storytellers = list("foo","bar","baz")
-	var/list/average_dynamic_threat = 50
-	var/list/saved_maps
-	var/list/saved_trophies = list()
 	var/list/spawned_objects = list()
 	var/list/antag_rep = list()
 	var/list/antag_rep_change = list()
@@ -28,62 +24,82 @@ SUBSYSTEM_DEF(persistence)
 	var/list/paintings = list()

 /datum/controller/subsystem/persistence/Initialize()
-	LoadSatchels()
-	LoadPoly()
-	LoadChiselMessages()
-	LoadTrophies()
-	LoadRecentModes()
-	LoadRecentStorytellers()
-	LoadRecentRulesets()
-	LoadRecentMaps()
-	LoadPhotoPersistence()
+	LoadServerPersistence()
+	LoadGamePersistence()
+	var/map_persistence_path = get_map_persistence_path()
+	if(map_persistence_path)
+		LoadMapPersistence()
+	return ..()
+
+/**
+ * Gets the persistence path of the current map.
+ */
+/datum/controller/subsystem/persistence/proc/get_map_persistence_path()
+	ASSERT(SSmapping.config)
+	if(!SSmapping.config.persistence_key || (SSmapping.config.persistence_key == "NO_PERSIST"))
+		return null
+	return "data/persistence/[ckey(SSmapping.config.persistence_key)]"
+
+/datum/controller/subsystem/persistence/proc/CollectData()
+	SaveServerPersistence()
+	if(station_persistence_save_disabled)
+		return
+	SaveGamePersistence()
+	var/map_persistence_path = get_map_persistence_path()
+	if(map_persistence_path)
+		SaveMapPersistence()
+
+/**
+ * Loads persistent data relevant to the server: Configurations, past gamemodes, votes, antag rep, etc
+ */
+/datum/controller/subsystem/persistence/proc/LoadServerPersistence()
 	for(var/client/C in GLOB.clients)
 		LoadSavedVote(C.ckey)
 	if(CONFIG_GET(flag/use_antag_rep))
 		LoadAntagReputation()
 	LoadRandomizedRecipes()
-	LoadPanicBunker()
-	return ..()
+	LoadPaintings()

-/datum/controller/subsystem/persistence/proc/LoadSatchels()
-	var/placed_satchel = 0
-	var/path
+/**
+ * Saves persistent data relevant to the server: Configurations, past gamemodes, votes, antag rep, etc
+ */
+/datum/controller/subsystem/persistence/proc/SaveServerPersistence()
+	if(CONFIG_GET(flag/use_antag_rep))
+		CollectAntagReputation()
+	SaveRandomizedRecipes()

-	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
-	var/list/json = list()
-	if(fexists(json_file))
-		json = json_decode(file2text(json_file))
+/**
+ * Loads persistent data relevant to the game in general: Photos, etc
+ *
+ * Legacy map persistence systems also use this.
+ */
+/datum/controller/subsystem/persistence/proc/LoadGamePersistence()
+	LoadChiselMessages()
+	LoadPhotoPersistence()
+	LoadPaintings()

-	old_secret_satchels = json["data"]
-	var/obj/item/storage/backpack/satchel/flat/F
-	if(old_secret_satchels && old_secret_satchels.len >= 10) //guards against low drop pools assuring that one player cannot reliably find his own gear.
-		var/pos = rand(1, old_secret_satchels.len)
-		F = new()
-		old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len)
-		F.x = old_secret_satchels[pos]["x"]
-		F.y = old_secret_satchels[pos]["y"]
-		F.z = SSmapping.station_start
-		path = text2path(old_secret_satchels[pos]["saved_obj"])
+/**
+ * Saves persistent data relevant to the game in general: Photos, etc
+ *
+ * Legacy map persistence systems also use this.
+ */
+/datum/controller/subsystem/persistence/proc/SaveGamePersistence()
+	CollectChiselMessages()
+	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
+	SavePaintings()
+	SaveScars()

-	if(F)
-		if(isfloorturf(F.loc) && !isplatingturf(F.loc))
-			F.hide(1)
-		if(ispath(path))
-			var/spawned_item = new path(F)
-			spawned_objects[spawned_item] = TRUE
-		placed_satchel++
-	var/free_satchels = 0
-	for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,SSmapping.station_start), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,SSmapping.station_start)))) //Nontrivially expensive but it's roundstart only
-		if(isfloorturf(T) && !isplatingturf(T))
-			new /obj/item/storage/backpack/satchel/flat/secret(T)
-			free_satchels++
-			if((free_satchels + placed_satchel) == 10) //ten tiles, more than enough to kill anything that moves
-				break
+/**
+ * Loads persistent data relevant to the current map: Objects, etc.
+ */
+/datum/controller/subsystem/persistence/proc/LoadMapPersistence()
+	return

-/datum/controller/subsystem/persistence/proc/LoadPoly()
-	for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
-		twitterize(P.speech_buffer, "polytalk")
-		break //Who's been duping the bird?!
+/**
+ * Saves persistent data relevant to the current map: Objects, etc.
+ */
+/datum/controller/subsystem/persistence/proc/SaveMapPersistence()
+	return

 /datum/controller/subsystem/persistence/proc/LoadChiselMessages()
 	var/list/saved_messages = list()
@@ -130,63 +146,6 @@ SUBSYSTEM_DEF(persistence)

 	log_world("Loaded [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")

-/datum/controller/subsystem/persistence/proc/LoadTrophies()
-	if(fexists("data/npc_saves/TrophyItems.sav")) //legacy compatability to convert old format to new
-		var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
-		var/saved_json
-		S >> saved_json
-		if(!saved_json)
-			return
-		saved_trophies = json_decode(saved_json)
-		fdel("data/npc_saves/TrophyItems.sav")
-	else
-		var/json_file = file("data/npc_saves/TrophyItems.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = json_decode(file2text(json_file))
-		if(!json)
-			return
-		saved_trophies = json["data"]
-	SetUpTrophies(saved_trophies.Copy())
-
-/datum/controller/subsystem/persistence/proc/LoadRecentModes()
-	var/json_file = file("data/RecentModes.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_modes = json["data"]
-
-/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
-	var/json_file = file("data/RecentRulesets.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_dynamic_rules = json["data"]
-
-/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
-	var/json_file = file("data/RecentStorytellers.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_storytellers = json["data"]
-	if(saved_storytellers.len > 3)
-		average_dynamic_threat = saved_storytellers[4]
-	saved_storytellers.len = 3
-
-/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
-	var/json_file = file("data/RecentMaps.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_maps = json["maps"]

 /datum/controller/subsystem/persistence/proc/LoadAntagReputation()
 	var/json = file2text(FILE_ANTAG_REP)
@@ -207,59 +166,6 @@ SUBSYSTEM_DEF(persistence)
 		return
 	saved_votes[ckey] = json["data"]

-/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
-	for(var/A in GLOB.trophy_cases)
-		var/obj/structure/displaycase/trophy/T = A
-		if (T.showpiece)
-			continue
-		T.added_roundstart = TRUE
-
-		var/trophy_data = pick_n_take(trophy_items)
-
-		if(!islist(trophy_data))
-			continue
-
-		var/list/chosen_trophy = trophy_data
-
-		if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed
-			continue
-
-		var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null
-		if(!path)
-			continue
-
-		T.showpiece = new /obj/item/showpiece_dummy(T, path)
-		T.trophy_message = chosen_trophy["message"]
-		T.placer_key = chosen_trophy["placer_key"]
-		T.update_icon()
-
-/datum/controller/subsystem/persistence/proc/CollectData()
-	CollectChiselMessages()
-	CollectSecretSatchels()
-	CollectTrophies()
-	CollectRoundtype()
-	if(istype(SSticker.mode, /datum/game_mode/dynamic))
-		var/datum/game_mode/dynamic/mode = SSticker.mode
-		CollectStoryteller(mode)
-		CollectRulesets(mode)
-	RecordMaps()
-	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
-	if(CONFIG_GET(flag/use_antag_rep))
-		CollectAntagReputation()
-	SaveRandomizedRecipes()
-	SavePanicBunker()
-	SavePaintings()
-	SaveScars()
-
-/datum/controller/subsystem/persistence/proc/LoadPanicBunker()
-	var/bunker_path = file("data/bunker_passthrough.json")
-	if(fexists(bunker_path))
-		var/list/json = json_decode(file2text(bunker_path))
-		GLOB.bunker_passthrough = json["data"]
-		for(var/ckey in GLOB.bunker_passthrough)
-			if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days))
-				GLOB.bunker_passthrough -= ckey
-
 /datum/controller/subsystem/persistence/proc/GetPhotoAlbums()
 	var/album_path = file("data/photo_albums.json")
 	if(fexists(album_path))
@@ -329,35 +235,6 @@ SUBSYSTEM_DEF(persistence)

 	WRITE_FILE(frame_path, frame_json)

-/datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
-	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
-	var/list/satchels_to_add = list()
-	for(var/A in new_secret_satchels)
-		var/obj/item/storage/backpack/satchel/flat/F = A
-		if(QDELETED(F) || F.z != SSmapping.station_start || F.invisibility != INVISIBILITY_MAXIMUM)
-			continue
-		var/list/savable_obj = list()
-		for(var/obj/O in F)
-			if(is_type_in_typecache(O, satchel_blacklist) || (O.flags_1 & ADMIN_SPAWNED_1))
-				continue
-			if(O.persistence_replacement)
-				savable_obj += O.persistence_replacement
-			else
-				savable_obj += O.type
-		if(isemptylist(savable_obj))
-			continue
-		var/list/data = list()
-		data["x"] = F.x
-		data["y"] = F.y
-		data["saved_obj"] = pick(savable_obj)
-		satchels_to_add += list(data)
-
-	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
-	var/list/file_data = list()
-	fdel(json_file)
-	file_data["data"] = old_secret_satchels + satchels_to_add
-	WRITE_FILE(json_file, json_encode(file_data))
-
 /datum/controller/subsystem/persistence/proc/CollectChiselMessages()
 	var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")

@@ -373,84 +250,6 @@ SUBSYSTEM_DEF(persistence)
 /datum/controller/subsystem/persistence/proc/SaveChiselMessage(obj/structure/chisel_message/M)
 	saved_messages += list(M.pack()) // dm eats one list

-
-/datum/controller/subsystem/persistence/proc/CollectTrophies()
-	var/json_file = file("data/npc_saves/TrophyItems.json")
-	var/list/file_data = list()
-	file_data["data"] = remove_duplicate_trophies(saved_trophies)
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/SavePanicBunker()
-	var/json_file = file("data/bunker_passthrough.json")
-	var/list/file_data = list()
-	file_data["data"] = GLOB.bunker_passthrough
-	fdel(json_file)
-	WRITE_FILE(json_file,json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/remove_duplicate_trophies(list/trophies)
-	var/list/ukeys = list()
-	. = list()
-	for(var/trophy in trophies)
-		var/tkey = "[trophy["path"]]-[trophy["message"]]"
-		if(ukeys[tkey])
-			continue
-		else
-			. += list(trophy)
-			ukeys[tkey] = TRUE
-
-/datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
-	if(!T.added_roundstart && T.showpiece)
-		var/list/data = list()
-		data["path"] = T.showpiece.type
-		data["message"] = T.trophy_message
-		data["placer_key"] = T.placer_key
-		saved_trophies += list(data)
-
-/datum/controller/subsystem/persistence/proc/CollectRoundtype()
-	saved_modes[3] = saved_modes[2]
-	saved_modes[2] = saved_modes[1]
-	saved_modes[1] = SSticker.mode.config_tag
-	var/json_file = file("data/RecentModes.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_modes
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
-	saved_storytellers.len = 3
-	saved_storytellers[3] = saved_storytellers[2]
-	saved_storytellers[2] = saved_storytellers[1]
-	saved_storytellers[1] = mode.storyteller.name
-	average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
-	var/json_file = file("data/RecentStorytellers.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_storytellers + average_dynamic_threat
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/CollectRulesets(var/datum/game_mode/dynamic/mode)
-	saved_dynamic_rules[3] = saved_dynamic_rules[2]
-	saved_dynamic_rules[2] = saved_dynamic_rules[1]
-	saved_dynamic_rules[1] = list()
-	for(var/r in mode.executed_rules)
-		var/datum/dynamic_ruleset/rule = r
-		saved_dynamic_rules[1] += rule.config_tag
-	var/json_file = file("data/RecentRulesets.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_dynamic_rules
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/RecordMaps()
-	saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
-	var/json_file = file("data/RecentMaps.json")
-	var/list/file_data = list()
-	file_data["maps"] = saved_maps
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-
 /datum/controller/subsystem/persistence/proc/CollectAntagReputation()
 	var/ANTAG_REP_MAXIMUM = CONFIG_GET(number/antag_rep_maximum)

@@ -0,0 +1,177 @@
+/**
+ * Persistence for cleanable debris.
+ */
+/datum/controller/subsystem/persistence
+	/// tracks if we already loaded debris. Unlike everything else, this can actually be a major problem if some badmin procs it twice.
+	var/loaded_debris = FALSE
+
+/datum/controller/subsystem/persistence/LoadMapPersistence()
+	. = ..()
+	if(CONFIG_GET(flag/persistent_debris))
+		LoadMapDebris()
+
+/datum/controller/subsystem/persistence/SaveMapPersistence()
+	. = ..()
+	if(CONFIG_GET(flag/persistent_debris))
+		SaveMapDebris()
+
+/datum/controller/subsystem/persistence/proc/LoadMapDebris()
+	if(CONFIG_GET(flag/persistent_debris_only))
+		wipe_existing_debris()
+	if(!fexists("[get_map_persistence_path()]/debris.json"))
+		return
+	if(loaded_debris)
+		return
+	loaded_debris = TRUE
+	var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+	var/list/allowed_z_cache = list()
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+		allowed_z_cache[num2text(z)] = TRUE
+	var/list/data = json_decode(file2text("[get_map_persistence_path()]/debris.json"))
+	var/list/z_lookup = list()
+	var/loaded = 0
+	var/list/loaded_by_type = list()
+	var/nopath = 0
+	var/badloc = 0
+	var/noturf = 0
+	/// reverse it
+	for(var/z in SSmapping.z_to_station_z_index)
+		var/sz = SSmapping.z_to_station_z_index[z]
+		z_lookup[num2text(sz)] = text2num(z)
+	for(var/z in data)
+		var/actual_z = z_lookup[z]
+		var/list/L1 = data[z]
+		for(var/x in L1)
+			var/list/L2 = data[z][x]
+			for(var/y in L2)
+				var/turf/tile = locate(text2num(x), text2num(y), actual_z)
+				if(!tile)
+					noturf++
+					continue
+				var/list/objects = data[z][x][y]
+				for(var/_L in objects)
+					var/list/objdata
+					var/path
+					if(islist(_L))
+						objdata = _L
+						path = text2path(objdata["__PATH__"])
+					else
+						path = text2path(_L)
+						objdata = objects[_L]
+					if(!path)
+						nopath++
+						continue
+					if(!IsValidDebrisLocation(tile, allowed_turf_typecache, allowed_z_cache, path, TRUE))
+						badloc++
+						continue
+					var/obj/effect/decal/cleanable/instantiated = new path(tile)
+					loaded_by_type[path] += 1
+					loaded++
+					if(objdata)
+						instantiated.PersistenceLoad(objdata)
+	var/list/bytype = list()
+	for(var/path in loaded_by_type)
+		bytype += "[path] - [loaded_by_type[path]]"
+	subsystem_log(
+	{"Debris loading completed:
+	Errors:
+	No path: [nopath]
+	Invalid location: [badloc]
+	No turf on map: [noturf]
+	Total loaded: [loaded]
+	By type:
+	[bytype.Join("\n")]"}
+	)
+
+/datum/controller/subsystem/persistence/proc/SaveMapDebris()
+	if(fexists("[get_map_persistence_path()]/debris.json"))
+		fdel("[get_map_persistence_path()]/debris.json")
+	if(CONFIG_GET(flag/persistent_debris_wipe_on_nuke) && station_was_destroyed)
+		return		// local janitor cheers on nukeop team to save some work
+	var/list/data = list()
+	var/list/z_lookup = SSmapping.z_to_station_z_index
+	var/list/debris = RelevantPersistentDebris()
+	var/obj/effect/decal/cleanable/saving
+	var/global_max = CONFIG_GET(number/persistent_debris_global_max)
+	var/type_max = CONFIG_GET(number/persistent_debris_type_max)
+	var/stored = 0
+	var/list/stored_by_type = list()
+	for(var/i in debris)
+		saving = i
+		var/list/serializing = list()
+		var/path = saving.PersistenceSave(serializing)
+		if(!path)
+			continue
+		if(stored_by_type[path] > type_max)
+			continue
+		var/text_z = num2text(z_lookup[num2text(saving.z)])
+		var/text_y = num2text(saving.y)
+		var/text_x = num2text(saving.x)
+		LAZYINITLIST(data[text_z])
+		LAZYINITLIST(data[text_z][text_x])
+		LAZYINITLIST(data[text_z][text_x][text_y])
+		if(saving.persistence_allow_stacking)
+			serializing["__PATH__"] = path
+			data[text_z][text_x][text_y] += list(serializing)
+		else
+			data[text_z][text_x][text_y][path] = serializing
+		stored++
+		if(stored > global_max)
+			var/w = "Persistent debris saving globally aborted due to global max >= [global_max]. Either janitors never do their jobs or something is wrong."
+			message_admins(w)
+			subsystem_log(w)
+			return
+		stored_by_type[path] = stored_by_type[path]? stored_by_type[path] + 1 : 1
+		if(stored_by_type[path] > type_max)
+			var/w = "Persistent debris saving aborted for type [path] due to type max >= [global_max]. Either janitors never do their jobs or something is wrong."
+			message_admins(w)
+			subsystem_log(w)
+
+	var/list/bytype = list()
+	for(var/path in stored_by_type)
+		bytype += "[path] - [stored_by_type[path]]"
+	subsystem_log(
+ 	{"Debris saving completed:
+	Total: [stored]
+	By type:
+	[bytype.Join("\n")]"}
+	)
+	WRITE_FILE(file("[get_map_persistence_path()]/debris.json"), json_encode(data))
+
+/datum/controller/subsystem/persistence/proc/IsValidDebrisLocation(turf/tile, list/allowed_typecache, list/allowed_zcache, obj/effect/decal/cleanable/type, loading = FALSE)
+	if(!allowed_typecache[tile.type])
+		return FALSE
+	var/area/A = tile.loc
+	if(!A.persistent_debris_allowed)
+		return FALSE
+	if(!allowed_zcache[num2text(tile.z)])
+		return FALSE
+	if(loading)
+		if(!initial(type.persistence_allow_stacking))
+			var/obj/effect/decal/cleanable/C = locate(type) in tile
+			if(!QDELETED(C))
+				return FALSE
+	// Saving verifies allow stacking in the save proc.
+	for(var/obj/structure/window/W in tile)
+		if(W.fulltile)
+			return FALSE
+	return TRUE
+
+/datum/controller/subsystem/persistence/proc/wipe_existing_debris()
+	var/list/existing = RelevantPersistentDebris()
+	QDEL_LIST(existing)
+
+/datum/controller/subsystem/persistence/proc/RelevantPersistentDebris()
+	var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+	var/list/allowed_z_cache = list()
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+		allowed_z_cache[num2text(z)] = TRUE
+	. = list()
+	for(var/obj/effect/decal/cleanable/C in world)
+		if(!C.loc || QDELETED(C))
+			continue
+		if(!C.persistent)
+			continue
+		if(!IsValidDebrisLocation(C.loc, allowed_turf_typecache, allowed_z_cache, C.type, FALSE))
+			continue
+		. += C
@@ -0,0 +1,26 @@
+/**
+ * Persists panic bunker whitelisting for a configured period of time
+ */
+/datum/controller/subsystem/persistence/LoadServerPersistence()
+	. = ..()
+	LoadPanicBunker()
+
+/datum/controller/subsystem/persistence/SaveServerPersistence()
+	. = ..()
+	SavePanicBunker()
+
+/datum/controller/subsystem/persistence/proc/LoadPanicBunker()
+	var/bunker_path = file("data/bunker_passthrough.json")
+	if(fexists(bunker_path))
+		var/list/json = json_decode(file2text(bunker_path))
+		GLOB.bunker_passthrough = json["data"]
+		for(var/ckey in GLOB.bunker_passthrough)
+			if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days))
+				GLOB.bunker_passthrough -= ckey
+
+/datum/controller/subsystem/persistence/proc/SavePanicBunker()
+	var/json_file = file("data/bunker_passthrough.json")
+	var/list/file_data = list()
+	file_data["data"] = GLOB.bunker_passthrough
+	fdel(json_file)
+	WRITE_FILE(json_file,json_encode(file_data))
@@ -0,0 +1,11 @@
+/**
+ * Persists poly messages across rounds
+ */
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+	. = ..()
+	LoadPoly()
+
+/datum/controller/subsystem/persistence/proc/LoadPoly()
+	for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
+		twitterize(P.speech_buffer, "polytalk")
+		break //Who's been duping the bird?!
@@ -0,0 +1,107 @@
+/**
+ * Stores recently played gamemodes, maps, etc.
+ */
+/datum/controller/subsystem/persistence
+	var/list/saved_modes = list(1,2,3)
+	var/list/saved_dynamic_rules = list(list(),list(),list())
+	var/list/saved_storytellers = list("foo","bar","baz")
+	var/list/average_dynamic_threat = 50
+	var/list/saved_maps
+
+/datum/controller/subsystem/persistence/SaveServerPersistence()
+	. = ..()
+	CollectRoundtype()
+	if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		CollectStoryteller(mode)
+		CollectRulesets(mode)
+	RecordMaps()
+
+/datum/controller/subsystem/persistence/LoadServerPersistence()
+	. = ..()
+	LoadRecentModes()
+	LoadRecentStorytellers()
+	LoadRecentRulesets()
+	LoadRecentMaps()
+
+/datum/controller/subsystem/persistence/proc/CollectRoundtype()
+	saved_modes[3] = saved_modes[2]
+	saved_modes[2] = saved_modes[1]
+	saved_modes[1] = SSticker.mode.config_tag
+	var/json_file = file("data/RecentModes.json")
+	var/list/file_data = list()
+	file_data["data"] = saved_modes
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
+	saved_storytellers.len = 3
+	saved_storytellers[3] = saved_storytellers[2]
+	saved_storytellers[2] = saved_storytellers[1]
+	saved_storytellers[1] = mode.storyteller.name
+	average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
+	var/json_file = file("data/RecentStorytellers.json")
+	var/list/file_data = list()
+	file_data["data"] = saved_storytellers + average_dynamic_threat
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/CollectRulesets(var/datum/game_mode/dynamic/mode)
+	saved_dynamic_rules[3] = saved_dynamic_rules[2]
+	saved_dynamic_rules[2] = saved_dynamic_rules[1]
+	saved_dynamic_rules[1] = list()
+	for(var/r in mode.executed_rules)
+		var/datum/dynamic_ruleset/rule = r
+		saved_dynamic_rules[1] += rule.config_tag
+	var/json_file = file("data/RecentRulesets.json")
+	var/list/file_data = list()
+	file_data["data"] = saved_dynamic_rules
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/RecordMaps()
+	saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
+	var/json_file = file("data/RecentMaps.json")
+	var/list/file_data = list()
+	file_data["maps"] = saved_maps
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/LoadRecentModes()
+	var/json_file = file("data/RecentModes.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_modes = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
+	var/json_file = file("data/RecentRulesets.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_dynamic_rules = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
+	var/json_file = file("data/RecentStorytellers.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_storytellers = json["data"]
+	if(saved_storytellers.len > 3)
+		average_dynamic_threat = saved_storytellers[4]
+	saved_storytellers.len = 3
+
+/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
+	var/json_file = file("data/RecentMaps.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_maps = json["maps"]
@@ -0,0 +1,79 @@
+/**
+ * Secret satchel persistence - allows storing of items in underfloor satchels that's loaded later.
+ */
+/datum/controller/subsystem/persistence
+	var/list/satchel_blacklist 		= list() //this is a typecache
+	var/list/new_secret_satchels 	= list() //these are objects
+	var/list/old_secret_satchels 	= list()
+
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+	. = ..()
+	LoadSatchels()
+
+/datum/controller/subsystem/persistence/SaveGamePersistence()
+	. = ..()
+	CollectSecretSatchels()
+
+/datum/controller/subsystem/persistence/proc/LoadSatchels()
+	var/placed_satchel = 0
+	var/path
+
+	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+	var/list/json = list()
+	if(fexists(json_file))
+		json = json_decode(file2text(json_file))
+
+	old_secret_satchels = json["data"]
+	var/obj/item/storage/backpack/satchel/flat/F
+	if(old_secret_satchels && old_secret_satchels.len >= 10) //guards against low drop pools assuring that one player cannot reliably find his own gear.
+		var/pos = rand(1, old_secret_satchels.len)
+		F = new()
+		old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len)
+		F.x = old_secret_satchels[pos]["x"]
+		F.y = old_secret_satchels[pos]["y"]
+		F.z = SSmapping.station_start
+		path = text2path(old_secret_satchels[pos]["saved_obj"])
+
+	if(F)
+		if(isfloorturf(F.loc) && !isplatingturf(F.loc))
+			F.hide(1)
+		if(ispath(path))
+			var/spawned_item = new path(F)
+			spawned_objects[spawned_item] = TRUE
+		placed_satchel++
+	var/free_satchels = 0
+	for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,SSmapping.station_start), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,SSmapping.station_start)))) //Nontrivially expensive but it's roundstart only
+		if(isfloorturf(T) && !isplatingturf(T))
+			new /obj/item/storage/backpack/satchel/flat/secret(T)
+			free_satchels++
+			if((free_satchels + placed_satchel) == 10) //ten tiles, more than enough to kill anything that moves
+				break
+
+/datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
+	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
+	var/list/satchels_to_add = list()
+	for(var/A in new_secret_satchels)
+		var/obj/item/storage/backpack/satchel/flat/F = A
+		if(QDELETED(F) || F.z != SSmapping.station_start || F.invisibility != INVISIBILITY_MAXIMUM)
+			continue
+		var/list/savable_obj = list()
+		for(var/obj/O in F)
+			if(is_type_in_typecache(O, satchel_blacklist) || (O.flags_1 & ADMIN_SPAWNED_1))
+				continue
+			if(O.persistence_replacement)
+				savable_obj += O.persistence_replacement
+			else
+				savable_obj += O.type
+		if(isemptylist(savable_obj))
+			continue
+		var/list/data = list()
+		data["x"] = F.x
+		data["y"] = F.y
+		data["saved_obj"] = pick(savable_obj)
+		satchels_to_add += list(data)
+
+	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+	var/list/file_data = list()
+	fdel(json_file)
+	file_data["data"] = old_secret_satchels + satchels_to_add
+	WRITE_FILE(json_file, json_encode(file_data))
@@ -0,0 +1,84 @@
+/**
+ * Stores trophies in curator display cases
+ */
+/datum/controller/subsystem/persistence
+	var/list/saved_trophies = list()
+
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+	. = ..()
+	LoadTrophies()
+
+/datum/controller/subsystem/persistence/SaveGamePersistence()
+	. = ..()
+	CollectTrophies()
+
+/datum/controller/subsystem/persistence/proc/LoadTrophies()
+	if(fexists("data/npc_saves/TrophyItems.sav")) //legacy compatability to convert old format to new
+		var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
+		var/saved_json
+		S >> saved_json
+		if(!saved_json)
+			return
+		saved_trophies = json_decode(saved_json)
+		fdel("data/npc_saves/TrophyItems.sav")
+	else
+		var/json_file = file("data/npc_saves/TrophyItems.json")
+		if(!fexists(json_file))
+			return
+		var/list/json = json_decode(file2text(json_file))
+		if(!json)
+			return
+		saved_trophies = json["data"]
+	SetUpTrophies(saved_trophies.Copy())
+
+/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
+	for(var/A in GLOB.trophy_cases)
+		var/obj/structure/displaycase/trophy/T = A
+		if (T.showpiece)
+			continue
+		T.added_roundstart = TRUE
+
+		var/trophy_data = pick_n_take(trophy_items)
+
+		if(!islist(trophy_data))
+			continue
+
+		var/list/chosen_trophy = trophy_data
+
+		if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed
+			continue
+
+		var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null
+		if(!path)
+			continue
+
+		T.showpiece = new /obj/item/showpiece_dummy(T, path)
+		T.trophy_message = chosen_trophy["message"]
+		T.placer_key = chosen_trophy["placer_key"]
+		T.update_icon()
+
+/datum/controller/subsystem/persistence/proc/CollectTrophies()
+	var/json_file = file("data/npc_saves/TrophyItems.json")
+	var/list/file_data = list()
+	file_data["data"] = remove_duplicate_trophies(saved_trophies)
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/remove_duplicate_trophies(list/trophies)
+	var/list/ukeys = list()
+	. = list()
+	for(var/trophy in trophies)
+		var/tkey = "[trophy["path"]]-[trophy["message"]]"
+		if(ukeys[tkey])
+			continue
+		else
+			. += list(trophy)
+			ukeys[tkey] = TRUE
+
+/datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
+	if(!T.added_roundstart && T.showpiece)
+		var/list/data = list()
+		data["path"] = T.showpiece.type
+		data["message"] = T.trophy_message
+		data["placer_key"] = T.placer_key
+		saved_trophies += list(data)
@@ -1,6 +1,4 @@
-//Fires five times every second.
-
 PROCESSING_SUBSYSTEM_DEF(fastprocess)
 	name = "Fast Processing"
-	wait = 2
+	wait = 0.2 SECONDS
 	stat_tag = "FP"
@@ -1,7 +1,7 @@
 PROCESSING_SUBSYSTEM_DEF(nanites)
 	name = "Nanites"
 	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
-	wait = 10
+	wait = 1 SECONDS

 	var/list/datum/nanite_cloud_backup/cloud_backups = list()
 	var/list/mob/living/nanite_monitored_mobs = list()
@@ -2,4 +2,4 @@ PROCESSING_SUBSYSTEM_DEF(obj)
 	name = "Objects"
 	priority = FIRE_PRIORITY_OBJ
 	flags = SS_NO_INIT
-	wait = 20
+	wait = 2 SECONDS
@@ -1,10 +1,10 @@
-//Used to process objects. Fires once every second.
+//Used to process objects.

 SUBSYSTEM_DEF(processing)
 	name = "Processing"
 	priority = FIRE_PRIORITY_PROCESS
 	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
-	wait = 10
+	wait = 1 SECONDS

 	var/stat_tag = "P" //Used for logging
 	var/list/processing = list()
@@ -14,9 +14,10 @@ SUBSYSTEM_DEF(processing)
 	msg = "[stat_tag]:[length(processing)]"
 	return ..()

-/datum/controller/subsystem/processing/fire(resumed = 0)
+/datum/controller/subsystem/processing/fire(resumed = FALSE)
 	if (!resumed)
 		currentrun = processing.Copy()
+	var/delta_time = (flags & SS_TICKER)? (wait * world.tick_lag * 0.1) : (wait * 0.1)
 	//cache for sanic speed (lists are references anyways)
 	var/list/current_run = currentrun

@@ -25,12 +26,26 @@ SUBSYSTEM_DEF(processing)
 		current_run.len--
 		if(QDELETED(thing))
 			processing -= thing
-		else if(thing.process(wait) == PROCESS_KILL)
+		else if(thing.process(delta_time) == PROCESS_KILL)
 			// fully stop so that a future START_PROCESSING will work
 			STOP_PROCESSING(src, thing)
 		if (MC_TICK_CHECK)
 			return

-/datum/proc/process()
-	set waitfor = 0
+
+/**
+ * This proc is called on a datum on every "cycle" if it is being processed by a subsystem. The time between each cycle is determined by the subsystem's "wait" setting.
+ * You can start and stop processing a datum using the START_PROCESSING and STOP_PROCESSING defines.
+ *
+ * Since the wait setting of a subsystem can be changed at any time, it is important that any rate-of-change that you implement in this proc is multiplied by the delta_time that is sent as a parameter,
+ * Additionally, any "prob" you use in this proc should instead use the DT_PROB define to make sure that the final probability per second stays the same even if the subsystem's wait is altered.
+ * Examples where this must be considered:
+ * - Implementing a cooldown timer, use `mytimer -= delta_time`, not `mytimer -= 1`. This way, `mytimer` will always have the unit of seconds
+ * - Damaging a mob, do `L.adjustFireLoss(20 * delta_time)`, not `L.adjustFireLoss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed
+ * - Probability of something happening, do `if(DT_PROB(25, delta_time))`, not `if(prob(25))`. This way, if the subsystem wait is e.g. lowered, there won't be a higher chance of this event happening per second
+ *
+ * If you override this do not call parent, as it will return PROCESS_KILL. This is done to prevent objects that dont override process() from staying in the processing list
+ */
+/datum/proc/process(delta_time)
+	set waitfor = FALSE
 	return PROCESS_KILL
@@ -5,8 +5,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 	name = "Quirks"
 	init_order = INIT_ORDER_QUIRKS
 	flags = SS_BACKGROUND
-	wait = 10
 	runlevels = RUNLEVEL_GAME
+	wait = 1 SECONDS

 	var/list/quirks = list()		//Assoc. list of all roundstart quirk datum types; "name" = /path/
 	var/list/quirk_names_by_path = list()
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(profiler)
 	if(CONFIG_GET(flag/auto_profile))
 		StartProfiling()
 	else
-		StopProfiling() //Stop the early start from world/New
+		StopProfiling() //Stop the early start profiler
 	return ..()

 /datum/controller/subsystem/profiler/fire()
@@ -31,12 +31,23 @@ SUBSYSTEM_DEF(profiler)
 	return ..()

 /datum/controller/subsystem/profiler/proc/StartProfiling()
+#if DM_BUILD < 1506
+	stack_trace("Auto profiling unsupported on this byond version")
+	CONFIG_SET(flag/auto_profile, FALSE)
+#else
 	world.Profile(PROFILE_START)
+#endif

 /datum/controller/subsystem/profiler/proc/StopProfiling()
+#if DM_BUILD >= 1506
 	world.Profile(PROFILE_STOP)
+#endif

 /datum/controller/subsystem/profiler/proc/DumpFile()
+#if DM_BUILD < 1506
+	stack_trace("Auto profiling unsupported on this byond version")
+	CONFIG_SET(flag/auto_profile, FALSE)
+#else
 	var/timer = TICK_USAGE_REAL
 	var/current_profile_data = world.Profile(PROFILE_REFRESH,format="json")
 	fetch_cost = MC_AVERAGE(fetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
@@ -49,3 +60,4 @@ SUBSYSTEM_DEF(profiler)
 	timer = TICK_USAGE_REAL
 	WRITE_FILE(json_file, current_profile_data)
 	write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+#endif
--- a/Show More
+++ b/Show More