From 8c0ece3c17cd258c5e238de311491ce8a4b25458 Mon Sep 17 00:00:00 2001 From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Date: Tue, 9 Aug 2022 01:41:26 -0400 Subject: [PATCH] Deadmin topic spam fix and fixes trailing MC panel after having deadmined (#68983) * Removes redundant init_verb() call * Fixes the MC tab not going away when you deadmin + runs Prettier on statbrowser.js * Revert "Fixes the MC tab not going away when you deadmin + runs Prettier on statbrowser.js" This reverts commit 2676d5f897cdc956b062f5d4785a7ebf2e1df8a9. * Now prettier will only work inside of the tgui folder * Actually makes the change for the MC tab sticking around forever --- .prettierignore | 5 +++++ code/modules/admin/holder2.dm | 1 - html/statbrowser.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000000..2b7500b2316b6 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,5 @@ +# We don't want prettier to run on anything outside of the TGUI folder, so we have to do this. +/* + +# We want it to run into the TGUI folder, however. +!/tgui diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 7ea622db3a92c..a96c1e86e0f00 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -164,7 +164,6 @@ GLOBAL_PROTECT(href_token) if(owner) GLOB.admins -= owner owner.remove_admin_verbs() - owner.init_verbs() owner.holder = null owner = null diff --git a/html/statbrowser.js b/html/statbrowser.js index f52bcd605a5d3..0d89487af5b39 100644 --- a/html/statbrowser.js +++ b/html/statbrowser.js @@ -504,7 +504,7 @@ function remove_listedturf() { } function remove_mc() { - removeStatusTab("MC"); + removePermanentTab("MC"); if (current_tab == "MC") { tab_change("Status"); }