diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 6ad3f37b2959..64d3a2c46699 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -46,11 +46,11 @@ jobs: tools/bootstrap/python -c '' - name: Run Linters run: | - bash tools/ci/check_filedirs.sh ColonialMarinesALPHA.dme + bash tools/ci/check_filedirs.sh colonialmarines.dme bash tools/ci/check_changelogs.sh bash tools/ci/check_grep.sh bash tools/ci/check_misc.sh - tools/bootstrap/python tools/ci/validate_dme.py < ColonialMarinesALPHA.dme + tools/bootstrap/python tools/ci/validate_dme.py < colonialmarines.dme tools/bootstrap/python -m tools.maplint.source --github tools/build/build --ci lint tgui-test tools/bootstrap/python -m dmi.test diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9984334c8279..8d7b4133840c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -26,12 +26,12 @@ }, { "type": "dreammaker", - "dme": "ColonialMarinesALPHA.dme", + "dme": "colonialmarines.dme", "problemMatcher": [ "$dreammaker" ], "group": "build", - "label": "dm: build - ColonialMarinesALPHA.dme" + "label": "dm: build - colonialmarines.dme" }, { "command": "${command:dreammaker.reparse}", diff --git a/Dockerfile b/Dockerfile index 34e84fa6e1b3..03eef406ee22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # TODO: Use an .envfile and make everyone use it instead ARG BYOND_BASE_IMAGE=ubuntu:focal ARG UTILITY_BASE_IMAGE=alpine:3 -ARG PROJECT_NAME=ColonialMarinesALPHA +ARG PROJECT_NAME=colonialmarines ARG BYOND_MAJOR=514 ARG BYOND_MINOR=1575 ARG NODE_VERSION=16 diff --git a/README.md b/README.md index c41bd8d6a4af..ffd1b3d04a90 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ On **2022-04-06** we have changed the way to compile the codebase. **The quick way**. Find `bin/server.cmd` in this folder and double click it to automatically build and host the server on port 1337. -**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then set up the server normally by opening `ColonialMarinesALPHA.dmb` in DreamDaemon. +**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then set up the server normally by opening `colonialmarines.dmb` in DreamDaemon. -**Building ColonialMarinesALPHA in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`. +**Building colonialmarines in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`. **[How to compile in VSCode and other build options](tools/build/README.md).** diff --git a/ColonialMarinesALPHA.dme b/colonialmarines.dme similarity index 99% rename from ColonialMarinesALPHA.dme rename to colonialmarines.dme index 882dd10ed65e..a190e768be6d 100644 --- a/ColonialMarinesALPHA.dme +++ b/colonialmarines.dme @@ -1,4 +1,4 @@ -// DM Environment file for baystation12.dme. +// DM Environment file for colonialmarines.dme. // All manual changes should be made outside the BEGIN_ and END_ blocks. // New source code should be placed in .dm files: choose File/New --> Code File. // BEGIN_INTERNALS diff --git a/compile_and_test.bat b/compile_and_test.bat index 51ebd12b945a..a02b36d6bc8b 100644 --- a/compile_and_test.bat +++ b/compile_and_test.bat @@ -1,10 +1,10 @@ @echo off -call dm ColonialMarinesALPHA.dme +call dm colonialmarines.dme if %ERRORLEVEL% == 0 goto :run_server goto :end :run_server -call DreamDaemon ColonialMarinesALPHA.dmb 58140 -trusted -params "local_test=1" +call DreamDaemon colonialmarines.dmb 58140 -trusted -params "local_test=1" :end -exit \ No newline at end of file +exit diff --git a/tools/build/build.js b/tools/build/build.js index 267104ecaa71..90f452b47deb 100644 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -22,7 +22,7 @@ Juke.setup({ file: import.meta.url }).then((code) => { process.exit(code); }); -const DME_NAME = "ColonialMarinesALPHA"; +const DME_NAME = "colonialmarines"; export const DefineParameter = new Juke.Parameter({ type: "string[]", diff --git a/tools/ci/run_server.sh b/tools/ci/run_server.sh index 6199182fc490..93f58be5f7c5 100644 --- a/tools/ci/run_server.sh +++ b/tools/ci/run_server.sh @@ -13,6 +13,6 @@ cp maps/$MAP.json ci_test/data/next_map.json cp maps/templates/space.json ci_test/data/next_ship.json cd ci_test -DreamDaemon ColonialMarinesALPHA.dmb -close -trusted -verbose -params "log-directory=ci" +DreamDaemon colonialmarines.dmb -close -trusted -verbose -params "log-directory=ci" cd .. cat ci_test/data/logs/ci/clean_run.lk diff --git a/tools/deploy.sh b/tools/deploy.sh index 9b048b15766c..60912266de43 100755 --- a/tools/deploy.sh +++ b/tools/deploy.sh @@ -23,7 +23,7 @@ if [ -d ".git" ]; then cp -r .git/logs/* $1/.git/logs/ fi -cp ColonialMarinesALPHA.dmb ColonialMarinesALPHA.rsc $1/ +cp colonialmarines.dmb colonialmarines.rsc $1/ cp -r maps/* $1/maps/ cp -r icons/* $1/icons/ cp -r sound/* $1/sound/ diff --git a/tools/expand_filedir_paths.py b/tools/expand_filedir_paths.py index 8bf07f222c2f..f8ef30245667 100644 --- a/tools/expand_filedir_paths.py +++ b/tools/expand_filedir_paths.py @@ -88,6 +88,6 @@ def replace_func(name): os.remove(path) os.rename(path + ".tmp", path) -dirs = read_filedirs("ColonialMarinesALPHA.dme"); +dirs = read_filedirs("colonialmarines.dme"); resources = index_files(dirs) rewrite_sources(resources)