Upstream staging

.editorconfig

@@ -1,22 +1,22 @@
+# http://editorconfig.org
 root = true
 
 [*]
-charset = utf-8
+indent_style = tab
 end_of_line = lf
-insert_final_newline = true
+charset = utf-8
 trim_trailing_whitespace = true
+insert_final_newline = true
 
-[*.{dme,dmf,dmm,dm}]
-end_of_line = crlf
-indent_style = tab
-
-[*.md]
-trim_trailing_whitespace = false
+[*.yml]
+indent_style = space
+indent_size = 2
 
 [*.py]
 indent_style = space
-indent_size = 4
 
-[*.yml]
+[*.md]
+trim_trailing_whitespace = false
+
+[Dockerfile]
 indent_style = space
-indent_size = 2

.gitattributes

@@ -1,16 +1,51 @@
+* text=auto
+
+## Enforce text mode and LF line breaks
+*.bat text eol=lf
+*.cjs 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
+*.ps1 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
 *.zip binary
 
-# dmm map merger hook
-# needs additional setup, see tools/mapmerge/install.txt
-# *.dmm merge=merge-dmm
+## Merger hooks, run tools/hooks/install.bat or install.sh to set up
+#*.dmm text eol=lf merge=dmm
+#*.dmi binary merge=dmi
 
-# dmi icon merger hook
+# old dmi icon merger hook
 # needs additional setup, see tools/dmitool/merging.txt
 *.dmi merge=merge-dmi
 
+## Force tab indents on dm files
+*.dm whitespace=indent-with-non-tab
+
 # force changelog merging to use union
 html/changelog.html merge=union

.github/workflows/autochangelog.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Ensure +x on CI directory
         run: |
           chmod -R +x ./tools/ci
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: '3.7'
       - name: Generate Changelog
@@ -36,7 +36,7 @@ jobs:
           python tools/GenerateChangelog/ss13_genchangelog.py \
             html/changelog.html \
             html/changelogs
-      - uses: stefanzweifel/git-auto-commit-action@v4
+      - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Automatic changelog generation for ${{ github.events.pull_request.number }}
           branch: ${{ github.events.pull_request.base }}

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
           bash tools/ci/install_build_deps.sh
       - name: Restore Yarn cache
         if: "${{ contains(github.event.pull_request.labels.*.name, 'Type: TGUI Bundle') }}"
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tgui/.yarn/cache
           key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }}
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Cache SpacemanDMM
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/SpacemanDMM
           key: ${{ runner.os }}-dreamchecker-${{ hashFiles('dependencies.sh')}}
@@ -76,7 +76,7 @@ jobs:
         run: |
           chmod -R +x ./tools/ci
       - name: Setup Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: $HOME/BYOND
           key: ${{ runner.os }}-byond

.gitignore

@@ -11,10 +11,15 @@ vchat.db*
 *.before
 *.pyc
 *.pid
-data
-data/
 cfg/
 
+#Ignore the data folder/symlink itself.  This is very important if you are using VGS
+/data
+
+#Ignore everything in datafolder and subdirectories
+/data/**/*
+/tmp/**/*
+
 #Visual studio stuff
 *.vscode/*
 !/.vscode/launch.json

.vscode/settings.json

@@ -1,16 +1,19 @@
 {
     "eslint.nodePath": "./tgui/.yarn/sdks",
     "eslint.workingDirectories": ["./tgui"],
-    "prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.js",
+    "prettier.prettierPath": "./tgui/.yarn/sdks/prettier/index.cjs",
     "typescript.tsdk": "./tgui/.yarn/sdks/typescript/lib",
     "typescript.enablePromptUseWorkspaceTsdk": true,
     "search.exclude": {
         "**/.yarn": true,
         "**/.pnp.*": true
     },
     "workbench.editorAssociations": {
-        "*.dmi": "imagePreview.previewEditor"
+        "*.dmi": "dmiEditor.dmiEditor"
     },
+    "editor.codeActionsOnSave": {
+		"source.fixAll.eslint": "explicit"
+	},
     "files.eol": "\n",
     "files.encoding": "utf8",
     "files.insertFinalNewline": true,
@@ -24,7 +27,7 @@
     ],
     "tgstationTestExplorer.project.resultsType": "json",
     "[dm]": {
-        "files.eol": "\r\n",
+        "files.eol": "\n",
         "editor.detectIndentation": false,
         "editor.insertSpaces": false
     },

Dockerfile

@@ -1,4 +1,23 @@
-FROM tgstation/byond:513.1533 as base
+FROM i386/ubuntu:xenial as base
+
+ARG BYOND_MAJOR=514
+ARG BYOND_MINOR=1589
+
+RUN apt-get update \
+    && apt-get install -y \
+    curl \
+    unzip \
+    make \
+    libstdc++6 \
+    && curl "https://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip \
+    && unzip byond.zip \
+    && cd byond \
+    && sed -i 's|install:|&\n\tmkdir -p $(MAN_DIR)/man6|' Makefile \
+    && make install \
+    && chmod 644 /usr/local/byond/man/man6/* \
+    && apt-get purge -y --auto-remove curl unzip make \
+    && cd .. \
+    && rm -rf byond byond.zip /var/lib/apt/lists/*
 
 FROM base as rust_g
 
@@ -16,7 +35,7 @@ RUN apt-get install -y --no-install-recommends \
     gcc-multilib \
     && curl https://sh.rustup.rs -sSf | sh -s -- -y --default-host i686-unknown-linux-gnu \
     && git init \
-    && git remote add origin https://github.com/tgstation/rust-g
+    && git remote add origin https://github.com/VOREStation/rust-g
 
 COPY _build_dependencies.sh .
 
@@ -52,8 +71,8 @@ RUN apt-get update \
     && 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=build /vorestation/ ./
+COPY --from=rust_g /rust_g/target/release/librust_g.so ./librust_g.so
 
 #VOLUME [ "/vorestation/config", "/vorestation/data" ]