Fix/dreamkeep linters

.editorconfig

@@ -1,14 +1,24 @@
+root = true
+
 [*]
 insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.dm]
+end_of_line = crlf
 indent_style = tab
 indent_size = 4
 
-[*.yml]
-indent_style = space
-indent_size = 2
+[*.dmm]
+end_of_line = crlf
 
 [*.py]
 indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2
 
 [/tgui/**/*.{js,styl,ract,json,html}]
 indent_style = space

.github/workflows/ci_suite.yml

@@ -10,35 +10,157 @@ on:
 
 env:
   BYOND_MAJOR: 515
-  BYOND_MINOR: 1636
+  BYOND_MINOR: 1646
+  SPACEMAN_DMM_VERSION: suite-1.9
 
 jobs:
-  build:
+  run-linters:
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
+    name: Run Linters
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup cache
+        uses: actions/cache@v4
+        with:
+          path: ~/SpacemanDMM
+          key: ${{ runner.os }}-spacemandmm-${{ hashFiles('dependencies.sh') }}
+          restore-keys: |
+            ${{ runner.os }}-spacemandmm-
+      - name: Restore Rust cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo
+          key: ${{ runner.os }}-rust-${{ hashFiles('tools/ci/ci_dependencies.sh')}}
+          restore-keys: |
+            ${{ runner.os }}-rust-
+      - name: Install Tools
+        run: |
+          pip3 install setuptools
+          bash tools/ci/install_spaceman_dmm.sh dreamchecker
+          bash tools/ci/install_ripgrep.sh
+          tools/bootstrap/python -c ''
+      - name: Run Linters
+        run: |
+          bash tools/ci/check_filedirs.sh roguetown.dme
+          bash tools/ci/check_changelogs.sh
+          find . -name "*.php" -print0 | xargs -0 -n1 php -l
+          bash tools/ci/check_grep.sh
+          tools/bootstrap/python tools/ci/validate_dme.py < roguetown.dme
+          tools/bootstrap/python -m dmi.test
+          tools/bootstrap/python -m mapmerge2.dmm_test
+          ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
+      - name: Annotate Lints
+        uses: yogstation13/DreamAnnotate@v2
+        if: always()
+        with:
+          outputFile: output-annotations.txt
+  OpenDream:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Python setup
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Setup Cache
+        uses: actions/cache@v4
+        with:
+          path: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
+          key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
+      - name: Install OpenDream
+        uses: robinraju/release-downloader@v1.9
+        with:
+          repository: "OpenDreamProject/OpenDream"
+          tag: "latest"
+          fileName: "DMCompiler_linux-x64.tar.gz"
+          extract: true
+      - name: Run OpenDream
+        run: ./DMCompiler_linux-x64/DMCompiler roguetown.dme --suppress-unimplemented --skip-anything-typecheck --version=${BYOND_MAJOR}.${BYOND_MINOR} | python tools/od_annotator/__main__.py "$@"
+  compile_all_maps:
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
+    name: Compile Maps
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Install BYOND
+        uses: actions/checkout@v4
+      - name: Setup cache
+        uses: actions/cache@v4
+        with:
+          path: ~/BYOND
+          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
+      - name: Compile All Maps
         run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y make gcc unzip
-          wget http://www.byond.com/download/build/${{ env.BYOND_MAJOR }}/${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}_byond_linux.zip
-          unzip ${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip
           bash tools/ci/install_byond.sh
-
-      - name: Compile BYOND project
+          source $HOME/BYOND/byond/bin/byondsetup
+          python3 tools/ci/template_dm_generator.py
+          DreamMaker -DCIBUILDING -DCITESTING -DALL_MAPS roguetown.dme
+  run_all_tests:
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
+    name: Integration Tests
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+    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:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Restore BYOND cache
+        uses: actions/cache@v4
+        with:
+          path: ~/BYOND
+          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
+      - 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 zlib1g-dev:i386
+          bash tools/ci/install_rust_g.sh
+      - name: Compile and run tests
         run: |
-          ls -h $HOME/
+          bash tools/ci/install_byond.sh
           source $HOME/BYOND/byond/bin/byondsetup
-          DreamMaker roguetown.dme
-
-      - name: Check for errors
-        id: check-errors
+          DreamMaker -DCIBUILDING -ignore loop_checks roguetown.dme
+          bash tools/ci/run_server.sh roguetest
+  test_windows:
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
+    name: Windows Build
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Restore BYOND cache
+        uses: actions/cache@v4
+        with:
+          path: C:\\byond
+          key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ secrets.CACHE_PURGE_KEY }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - name: Compile
+        run: pwsh tools/ci/build.ps1
+        env:
+          DM_EXE: "C:\\byond\\bin\\dm.exe"
+      - name: Create artifact
         run: |
-          if grep -q "error" *.log; then
-            echo "::error ::Compilation failed with errors."
-            exit 1
-          else
-            echo "Compilation succeeded without critical errors."
-          fi
+          md deploy
+          bash tools/deploy.sh ./deploy
+      - name: Deploy artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: deploy
+          path: deploy

.gitignore

@@ -220,3 +220,9 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
 /config/ezdb.txt
 tgui/src/images/syndicate.svg
 tgui/src/images/nanotrasen.svg
+/data
+
+/prof.dll
+
+# OpenDream-compiled DME
+/roguetown.json

README.md

@@ -1,2 +1,64 @@
-## Discord
-Come join our [discord](https://discord.gg/YTp2GTzwyv)!
+<p align="center">
+ <img width="600px" src="https://images2.imgbox.com/ee/79/eFJUhh4w_o.png" align="center" alt="Dreamkeep Stats" />
+ <h1 align="center">DREAMKEEP</h1>
+ <h2 align="center">M-RP / H-RP Medieval Fantasy</h2>
+</p>
+
+<p align="center">
+    <a href="https://github.com/StoneHedgeSS13/StoneHedge/graphs/contributors">
+      <img alt="GitHub Contributors" src="https://img.shields.io/github/contributors/StoneHedgeSS13/StoneHedge" />
+    </a>
+    <a href="https://github.com/StoneHedgeSS13/StoneHedge/issues">
+      <img alt="Issues" src="https://img.shields.io/github/issues/StoneHedgeSS13/StoneHedge?color=0088ff" />
+    </a>
+    <a href="https://github.com/StoneHedgeSS13/StoneHedge/pulls">
+      <img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/StoneHedgeSS13/StoneHedge?color=0088ff" />
+    </a>
+</p>
+
+<p align="center">
+	<a href="https://github.com/StoneHedgeSS13/StoneHedge/actions/workflows/ci_suite.yml">
+      <img alt="BYOND Build" src="https://github.com/StoneHedgeSS13/StoneHedge/actions/workflows/ci_suite.yml/badge.svg" />
+    </a>
+</p>
+
+<div align="center">
+
+| Community links                   |
+|----------------------------------|
+| [Discord](https://discord.gg/vJDHxXbqvv)                          |
+
+</div>
+
+# LICENSE
+
+## Dreamkeep
+
+All original code and assets of this repository are under the [GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.en.html) unless otherwise indicated.
+
+## Dreamkeep - Proprietary
+
+The following assets are under a custom license as per original author's wishes, assets authored by Dreamkeep indicate collaborative work among it's artists, and may be credited within files.
+
+[ADDITIONAL TERMS](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/ADDITIONAL-TERMS.md)
+
+| Reference                                    | Author        |   License  |
+|----------------------------------------------|---------------|------------|
+| [licensed-dreamkeep](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/licensed-dreamkeep)                   | Dreamkeep    | [License](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/licensed-dreamkeep/LICENSE.md)|
+| [licensed-eaglephntm](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/licensed-eaglephntm)                   | EaglePhntm    | [License](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/licensed-eaglephntm/LICENSE.md)|
+| [licensed-feralope](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/licensed-feralope)                   | Feralope    | [License](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/licensed-feralope/LICENSE.md)|
+| [licensed-feralope (helmsguard)](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_helmsguard/licensed-feralope)                   | Feralope    | [License](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_helmsguard/licensed-feralope/LICENSE.md)|
+| [licensed-death-rattler](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_helmsguard/licensed-death-rattler)                   | Moribund/Luctus-Comptus    | [License](https://github.com/StoneHedgeSS13/StoneHedge/tree/main/modular_stonehedge/licensed-death-rattler/LICENSE.md)|
+
+## TG
+
+All code after [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/tgstation/tgstation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.html).
+
+All code before [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/tgstation/tgstation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html).
+(Including tools unless their readme specifies otherwise.)
+
+The TGS DMAPI is licensed as a subproject under the MIT license.
+
+See the footer of [code/__DEFINES/tgs.dm](./code/__DEFINES/tgs.dm) and [code/modules/tgs/LICENSE](./code/modules/tgs/LICENSE) for the MIT license.
+
+All other assets including icons and sound are under the [Creative Commons 3.0 BY-SA license](https://creativecommons.org/licenses/by-sa/3.0/) unless otherwise indicated.

SpacemanDMM.toml

@@ -1,4 +1,56 @@
 environment = "roguetown.dme"
 
+[langserver]
+dreamchecker = true
+
+[dmdoc]
+use_typepath_names = true
+
+[code_standards]
+disallow_relative_type_definitions = true
+disallow_relative_proc_definitions = true
+
 [debugger]
 engine = "auxtools"
+
+[diagnostics]
+# Raised by DreamChecker
+disabled_directive = "error"
+sets_directive_twice = "error"
+invalid_lint_directive_value = "error"
+invalid_set_value = "error"
+unknown_linter_setting = "error"
+override_missing_keyword_arg = "error"
+must_not_override = "error"
+must_call_parent = "error"
+final_var = "error"
+private_proc = "error"
+protected_proc = "error"
+private_var = "error"
+protected_var = "error"
+must_be_pure = "error"
+must_not_sleep = "error"
+redefined_proc = "off"
+ambiguous_in_lhs = "error"
+ambiguous_not_bitwise = "error"
+no_typehint_implicit_new = "error"
+field_access_static_type = "error"
+proc_call_static_type = "error"
+proc_has_no_parent = "error"
+no_operator_overload = "error"
+unreachable_code = "error"
+control_condition_static = "error"
+if_condition_determinate = "error"
+loop_condition_determinate = "error"
+
+# Raised by Lexer
+integer_precision_loss = "error"
+
+# Raised by Parser
+duplicate_include = "error"
+macro_redefined = "error"
+macro_undefined_no_definition = "error"
+
+[map_renderer.render_passes]
+icon-smoothing = false
+icon-smoothing-2016 = true

_maps/_basemap.dm

@@ -7,8 +7,8 @@
 		#include "map_files\Roguetown\roguetown.dmm"
 		#include "map_files\Rogueworld\Rogueworld.dmm"
 
-		#ifdef TRAVISBUILDING
+		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif
 	#endif
-#endif
+#endif

_maps/deepnorth.json

@@ -2,5 +2,5 @@
     "map_name": "deepnorth",
     "map_path": "map_files/hearthstone",
     "map_file": "deepnorth.dmm",
-	"traits": [{"Up": 1}, {"Up": 1, "Down": -1}, {"Up": 1, "Down": -1}, {"Down": -1}]
+	"traits": [{"Up": true}, {"Up": true, "Down": true}, {"Up": true, "Down": true}, {"Down": true}]
 }

_maps/dreamhold.json

@@ -2,7 +2,7 @@
     "map_name": "Dreamhold",
     "map_path": "map_files/dreamhold",
     "map_file": "Dreamhold.dmm",
-	"traits": [{"Up": 1}, {"Up": 1, "Down": -1}, {"Up": 1, "Down": -1}, {"Up": 1, "Down": -1}, {"Down": -1}],
+	"traits": [{"Up": true}, {"Up": true, "Down": true}, {"Up": true, "Down": true}, {"Up": true, "Down": true}, {"Down": true}],
 	"minetype": null,
 	"space_empty_levels": 0,
 	"space_ruin_levels": 0,