Merge pull request #326 from nuke-ops/upstream

Upstream

.github/workflows/make_changelogs.yml

@@ -0,0 +1,31 @@
+name: Make changelogs
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  MakeCL:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 25
+      - name: Python setup
+        uses: actions/setup-python@v1
+        with:
+          python-version: "3.9"
+      - name: Install depends
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r tools/changelog/requirements.txt
+      - name: Make CL
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} #Use this instead if you have unprotected branches
+          #GITHUB_TOKEN: ${{ secrets.CL_TOKEN }}
+          GIT_EMAIL: "85452301+Sandstorm-Bot@users.noreply.github.com"
+          GIT_NAME: "Sandstorm Bot"
+        run: python tools/changelog/generate_cl.py

.tgs.yml

@@ -18,6 +18,6 @@ linux_scripts:
   PreCompile.sh: tools/tgs4_scripts/PreCompile.sh
 # Same as above for Windows hosted servers
 windows_scripts:
-  PreCompile.bat: tools/tgs_scripts/PreCompile.bat
+  PreCompile.bat: tools/tgs4_scripts/PreCompile.bat
 # The security level the game should be run at
 security: Trusted

.vscode/launch.json

@@ -7,6 +7,44 @@
       "name": "Launch DreamSeeker",
       "preLaunchTask": "Build All",
       "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+    },
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamDaemon",
+      "preLaunchTask": "Build All",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}",
+      "dreamDaemon": true
+    },
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamSeeker (TESTING)",
+      "preLaunchTask": "Build All (TESTING)",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+    },
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamDaemon (TESTING)",
+      "preLaunchTask": "Build All (TESTING)",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}",
+      "dreamDaemon": true
+    },
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamSeeker (LOWMEMORYMODE)",
+      "preLaunchTask": "Build All (LOWMEMORYMODE)",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+    },
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamDaemon (LOWMEMORYMODE)",
+      "preLaunchTask": "Build All (LOWMEMORYMODE)",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}",
+      "dreamDaemon": true
     }
   ]
 }

.vscode/tasks.json

@@ -24,6 +24,56 @@
 			"dependsOn": "dm: reparse",
 			"label": "Build All"
 		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"windows": {
+				"command": ".\\tools\\build\\build.bat"
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"args": [
+				"-DTESTING"
+			],
+			"label": "Build All (TESTING)"
+		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"windows": {
+				"command": ".\\tools\\build\\build.bat"
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"args": [
+				"-DLOWMEMORYMODE"
+			],
+			"label": "Build All (LOWMEMORYMODE)"
+		},
 		{
 			"type": "dreammaker",
 			"dme": "tgstation.dme",

Dockerfile

@@ -1,5 +1,5 @@
 # base = ubuntu + full apt update
-FROM ubuntu:xenial-20210416 AS base
+FROM ubuntu:xenial AS base
 
 RUN dpkg --add-architecture i386 \
     && apt-get update \