From fd832d6b20b455658bd16e80e2a89dc8853ba0fd Mon Sep 17 00:00:00 2001 From: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Date: Thu, 28 Dec 2023 11:42:03 -0500 Subject: [PATCH] make world status use config values (#2609) --- .vscode/settings.json | 4 ++-- code/game/world.dm | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ee251eb53460..ff1b67e91d23 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,14 +17,14 @@ "**/.pnp.*": true }, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true + "source.fixAll.eslint": "explicit" }, "files.insertFinalNewline": true, "gitlens.advanced.blame.customArguments": ["-w"], "tgstationTestExplorer.project.resultsType": "json", "[python]": { "gitlens.codeLens.symbolScopes": ["!Module"], - "editor.wordBasedSuggestions": false, + "editor.wordBasedSuggestions": "off", "editor.insertSpaces": true, "editor.tabSize": 4 }, diff --git a/code/game/world.dm b/code/game/world.dm index 8365283c7897..a9881d19d977 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -310,14 +310,23 @@ GLOBAL_VAR(restart_counter) features += "AI allowed" hostedby = CONFIG_GET(string/hostedby) + var/discord_url + var/github_url + if(isnull(config)) + discord_url = "https://shiptest.net/discord" + github_url = "https://github.com/shiptest-ss13/Shiptest" + else + discord_url = CONFIG_GET(string/discordurl) + github_url = CONFIG_GET(string/githuburl) + s += "[station_name()]"; s += " (" - s += "" //Change this to wherever you want the hub to link to. + s += "" //Change this to wherever you want the hub to link to. s += "Discord" //Replace this with something else. Or ever better, delete it and uncomment the game version. s += "" s += ")" s += " (" - s += "" + s += "" s += "Github" s += "" s += ")"