diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index 4af53680e6..7cd31b148f 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -210,7 +210,7 @@ config_entry_value = "http://www.tgstation13.org/wiki" /datum/config_entry/string/discordurl - config_entry_value = "http://tgstation13.org/phpBB/index.php" + config_entry_value = "http://discord.gg" /datum/config_entry/string/rulesurl config_entry_value = "http://www.tgstation13.org/wiki/Rules" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 718f9d4246..22b260360e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -11,7 +11,8 @@ GLOBAL_PROTECT(admin_verbs_default) /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ /client/proc/toggleprayers, - /client/proc/toggleadminhelpsound + /client/proc/toggleadminhelpsound, + /client/proc/fix_air /*resets air in designated radius to its default atmos composition*/ ) GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) GLOBAL_PROTECT(admin_verbs_admin) diff --git a/code/modules/client/darkmode.dm b/code/modules/client/darkmode.dm index f806e5c964..29c27bf08e 100644 --- a/code/modules/client/darkmode.dm +++ b/code/modules/client/darkmode.dm @@ -24,7 +24,7 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this. winset(src, "changelog", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]") winset(src, "rules", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]") winset(src, "wiki", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]") - winset(src, "forum", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]") + winset(src, "discord", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]") winset(src, "github", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]") winset(src, "report-issue", "background-color = [COLOR_WHITEMODE_ISSUE_BUTTON_BG];text-color = [COLOR_WHITEMODE_TEXT]") //Status and verb tabs @@ -50,7 +50,7 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this. winset(src, "changelog", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]") winset(src, "rules", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]") winset(src, "wiki", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]") - winset(src, "forum", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "discord", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]") winset(src, "github", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]") winset(src, "report-issue", "background-color = [COLOR_DARKMODE_ISSUE_BUTTON_BG];text-color = [COLOR_DARKMODE_TEXT]") //Status and verb tabs @@ -62,4 +62,4 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this. //Etc. winset(src, "say", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]") winset(src, "asset_cache_browser", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]") - winset(src, "tooltip", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]") \ No newline at end of file + winset(src, "tooltip", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]") diff --git a/interface/skin.dmf b/interface/skin.dmf index bb517efe25..32596d815c 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -172,7 +172,7 @@ window "infowindow" saved-params = "is-checked" text = "Wiki" command = "wiki" - elem "forum" + elem "discord" type = BUTTON pos = 320,5 size = 100x20 @@ -181,8 +181,8 @@ window "infowindow" text-color = #e0e0e0 background-color = #40628a saved-params = "is-checked" - text = "Forum" - command = "forum" + text = "Discord" + command = "discord" elem "github" type = BUTTON pos = 420,5 diff --git a/sandcode/code/modules/admin/verbs/fix_air.dm b/sandcode/code/modules/admin/verbs/fix_air.dm new file mode 100644 index 0000000000..2798d5543f --- /dev/null +++ b/sandcode/code/modules/admin/verbs/fix_air.dm @@ -0,0 +1,22 @@ +// Proc taken from yogstation, credit to nichlas0010 for the original +/client/proc/fix_air(turf/open/T in world) + set name = "Fix Air" + set category = "Admin - Game" + set desc = "Fixes air in specified radius." + + if(!holder) + to_chat(src, "Only administrators may use this command.", confidential = TRUE) + return + + if(check_rights(R_ADMIN, TRUE)) + var/range = input("Enter range:", "Num", 2) as num + message_admins("[key_name_admin(usr)] fixed air with range [range] at [ADMIN_VERBOSEJMP(T)]") + log_game("[key_name_admin(usr)] fixed air with range [range] at [AREACOORD(T)]") + var/datum/gas_mixture/GM = new + for(var/turf/open/F in range(range, T)) + if(F.blocks_air) + //skip walls + continue + GM.parse_gas_string(F.initial_gas_mix) + F.copy_air(GM) + F.update_visuals() diff --git a/tgstation.dme b/tgstation.dme index ad41cec7f3..d6ea1a846e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3614,6 +3614,7 @@ #include "sandcode\code\interactions\lewd\lewd_interactions.dm" #include "sandcode\code\interactions\lewd\lewd_species.dm" #include "sandcode\code\interactions\lewd\objects.dm" +#include "sandcode\code\modules\admin\verbs\fix_air.dm" #include "sandcode\code\modules\atmospherics\machinery\pipes\bluespace.dm" #include "sandcode\code\modules\cargo\packs\emergency.dm" #include "sandcode\code\modules\cargo\packs\misc.dm"