Merge branch 'master' into earlymirrorntnrc

Signed-off-by: _0Steven <[email protected]>
DopplerShift13 · Nov 6, 2024 · 4f60888 · 4f60888
2 parents 50d35f7 + 96304f4
commit 4f60888
Show file tree

Hide file tree

Showing 4,591 changed files with 12,537 additions and 6,855 deletions.
diff --git a/.gitignore b/.gitignore
@@ -248,3 +248,4 @@ define_sanity_output.txt
 
 # Running OpenDream locally
 tgstation.json
+rust_g64.dll
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -54,6 +54,13 @@
 				"-trusted"
 			],
 			"preLaunchTask": "Build All (low memory mode)"
+		},
+		{
+			"type": "opendream",
+			"request": "launch",
+			"name": "Launch OpenDream (requires extension, 64 bit rustg, and an SS14 account)",
+			"preLaunchTask": "OpenDream: compile ${command:CurrentDME}",
+			"json_path": "${workspaceFolder}/${command:CurrentJson}"
 		}
 	]
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -248,3 +248,4 @@ define_sanity_output.txt

		# Running OpenDream locally
		tgstation.json
		rust_g64.dll