diff --git a/.editorconfig b/.editorconfig
index 13dcd5e029..c44572fbf9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,11 +1,14 @@
 [*]
-insert_final_newline = true
 indent_style = tab
 indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+#end_of_line = lf
 
 [*.yml]
 indent_style = space
 indent_size = 2
 
-[*.txt]
-insert_final_newline = false
+[*.py]
+indent_style = space
diff --git a/.gitattributes b/.gitattributes
index a0a624af04..c447869d3e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,42 @@
-# merger hooks, run tools/hooks/install.bat or install.sh to set up
-*.dmm merge=dmm
-*.dmi merge=dmi
-
-# force changelog merging to use union
-html/changelog.html merge=union
-
-# force all files to be LF 
 * text=auto
+
+## Enforce text mode and LF line breaks
+## porter note: not yet LFing dm.
+# *.bat text eol=lf
+*.css text eol=lf
+# *.dm text eol=lf
+# *.dme text eol=lf
+# *.dmf text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.json text eol=lf
+*.jsx text eol=lf
+# *.md text eol=lf
+*.py text eol=lf
+*.scss text eol=lf
+# *.sh text eol=lf
+# *.sql text eol=lf
+*.svg text eol=lf
+*.ts text eol=lf
+*.tsx text eol=lf
+# *.txt text eol=lf
+*.yaml text eol=lf
+*.yml text eol=lf
+
+## Enforce binary mode
+*.bmp binary
+*.dll binary
+*.dmb binary
+*.exe binary
+*.gif binary
+*.jpg binary
+*.png binary
+*.so binary
+
+## Merger hooks, run tools/hooks/install.bat or install.sh to set up
+*.dmm text eol=lf merge=dmm
+*.dmi binary merge=dmi
+
+## Force changelog merging to use union
+html/changelog.html text eol=lf merge=union
diff --git a/.github/workflows/autobuild_tgui.yml b/.github/workflows/autobuild_tgui.yml
deleted file mode 100644
index 226ea2b7ce..0000000000
--- a/.github/workflows/autobuild_tgui.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Autobuild TGUI
-
-on:
-  push:
-    branches:
-      - 'master'
-    paths:
-      - 'tgui/**.js'
-      - 'tgui/**.scss'
-
-jobs:
-  build:
-    name: Rebuild TGUI
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 25
-      - name: Setup Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: '>=12.13'
-      - name: Build TGUI
-        run: bin/tgui --ci
-        working-directory: ./tgui
-      - name: Commit Artifacts
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "TGUI"
-          git pull origin master
-          git commit -m "Automatic TGUI Rebuild [ci skip]" -a || true
-      - name: Push Artifacts
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_MASTER_KEY }}
diff --git a/.github/workflows/round_id_linker.yml b/.github/workflows/round_id_linker.yml
new file mode 100644
index 0000000000..37998a93eb
--- /dev/null
+++ b/.github/workflows/round_id_linker.yml
@@ -0,0 +1,12 @@
+name: "Round ID Linker"
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  link_rounds:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: Cidatel-Station-13/round_linker@master #notice: fork the round linkies from tg!!
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index f65245c021..e885761104 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,13 +198,36 @@ Temporary Items
 !/.vscode/extensions.json
 tools/MapAtmosFixer/MapAtmosFixer/obj/*
 tools/MapAtmosFixer/MapAtmosFixer/bin/*
+tools/CreditsTool/bin/*
+tools/CreditsTool/obj/*
 
 #GitHub Atom
 .atom-build.json
 
-#Jukebox audio files
-/config/jukebox_music/**/*
+#KDevelop and Kate
+*.kdev4*
+*.kate-swp
 
 #extra map stuff
 /_maps/**/backup/
 /_maps/templates.dm
+
+#dmdoc default folder
+/dmdoc
+
+# Ignore custom music and title screens (amend as appropriate)
+/config/jukebox_music/sounds/*
+!/config/jukebox_music/sounds/exclude
+/config/title_music/sounds/*
+!/config/title_music/sounds/exclude
+/config/title_screens/images/*
+!/config/title_screens/images/exclude
+
+#Linux docker
+tools/LinuxOneShot/SetupProgram/obj/*
+tools/LinuxOneShot/SetupProgram/bin/*
+tools/LinuxOneShot/SetupProgram/.vs
+tools/LinuxOneShot/Database
+tools/LinuxOneShot/TGS_Config
+tools/LinuxOneShot/TGS_Instances
+tools/LinuxOneShot/TGS_Logs
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000..11d27b55d3
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+build:
+    stage: build
+    rules:
+      - if: $CI_MERGE_REQUEST_IID || $CI_COMMIT_REF_NAME == "master"
+        changes:
+          - tgui/**/*.js
+          - tgui/**/*.scss
+        when: always
+    image: node:lts
+    script:
+        - tgui/bin/tgui --ci
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb2..0000000000