From 8cb3827c42f044ae2a12fdd666ae608b7bc5a555 Mon Sep 17 00:00:00 2001 From: ASmallCuteCat Date: Mon, 22 Jun 2026 09:55:04 -0400 Subject: [PATCH] Renames the round-ending admin secrets to something much less questionable (#22669) The admin commands to set off events that end the round (Supermatter cascade and Summon Narsie) were in a category with a problematic name (redid the PR after i broke it with a bad merge oops) --- aurorastation.dme | 4 +- code/modules/admin/admin_secrets.dm | 8 +-- .../summon_narsie.dm | 4 +- .../supermatter_cascade.dm | 4 +- ...oundEndingSecretRename - ASmallCuteCat.yml | 58 +++++++++++++++++++ 5 files changed, 68 insertions(+), 10 deletions(-) rename code/modules/admin/secrets/{final_solutions => roundending_secrets}/summon_narsie.dm (75%) rename code/modules/admin/secrets/{final_solutions => roundending_secrets}/supermatter_cascade.dm (80%) create mode 100644 html/changelogs/RoundEndingSecretRename - ASmallCuteCat.yml diff --git a/aurorastation.dme b/aurorastation.dme index e9afba6586d..b5ee1175902 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1711,8 +1711,6 @@ #include "code\modules\admin\secrets\admin_secrets\show_game_mode.dm" #include "code\modules\admin\secrets\admin_secrets\show_law_changes.dm" #include "code\modules\admin\secrets\admin_secrets\show_signalers.dm" -#include "code\modules\admin\secrets\final_solutions\summon_narsie.dm" -#include "code\modules\admin\secrets\final_solutions\supermatter_cascade.dm" #include "code\modules\admin\secrets\fun_secrets\break_all_lights.dm" #include "code\modules\admin\secrets\fun_secrets\break_some_lights.dm" #include "code\modules\admin\secrets\fun_secrets\fix_all_lights.dm" @@ -1730,6 +1728,8 @@ #include "code\modules\admin\secrets\fun_secrets\turn_humans_into_corgies.dm" #include "code\modules\admin\secrets\fun_secrets\turn_humans_into_monkeys.dm" #include "code\modules\admin\secrets\random_events\trigger_cordical_borer_infestation.dm" +#include "code\modules\admin\secrets\roundending_secrets\summon_narsie.dm" +#include "code\modules\admin\secrets\roundending_secrets\supermatter_cascade.dm" #include "code\modules\admin\verbs\access_control.dm" #include "code\modules\admin\verbs\adminhelp.dm" #include "code\modules\admin\verbs\adminjump.dm" diff --git a/code/modules/admin/admin_secrets.dm b/code/modules/admin/admin_secrets.dm index a9832d18c19..6ccfb93f130 100644 --- a/code/modules/admin/admin_secrets.dm +++ b/code/modules/admin/admin_secrets.dm @@ -78,8 +78,8 @@ var/datum/admin_secrets/admin_secrets = new() /datum/admin_secret_category/fun_secrets name = "Fun Secrets" -/datum/admin_secret_category/final_solutions - name = "Final Solutions" +/datum/admin_secret_category/roundending_secrets + name = "Round-ending Secrets" desc = "(Warning, these will end the round!)" /************************* @@ -100,6 +100,6 @@ var/datum/admin_secrets/admin_secrets = new() permissions = R_FUN warn_before_use = 1 -/datum/admin_secret_item/final_solution - category = /datum/admin_secret_category/final_solutions +/datum/admin_secret_item/round_ending_secret + category = /datum/admin_secret_category/roundending_secrets permissions = R_FUN|R_SERVER|R_ADMIN diff --git a/code/modules/admin/secrets/final_solutions/summon_narsie.dm b/code/modules/admin/secrets/roundending_secrets/summon_narsie.dm similarity index 75% rename from code/modules/admin/secrets/final_solutions/summon_narsie.dm rename to code/modules/admin/secrets/roundending_secrets/summon_narsie.dm index 32fb24d0c04..a0841ab535a 100644 --- a/code/modules/admin/secrets/final_solutions/summon_narsie.dm +++ b/code/modules/admin/secrets/roundending_secrets/summon_narsie.dm @@ -1,7 +1,7 @@ -/datum/admin_secret_item/final_solution/summon_narsie +/datum/admin_secret_item/round_ending_secret/summon_narsie name = "Summon Nar-Sie" -/datum/admin_secret_item/final_solution/summon_narsie/execute(var/mob/user) +/datum/admin_secret_item/round_ending_secret/summon_narsie/execute(var/mob/user) . = ..() if(!.) return diff --git a/code/modules/admin/secrets/final_solutions/supermatter_cascade.dm b/code/modules/admin/secrets/roundending_secrets/supermatter_cascade.dm similarity index 80% rename from code/modules/admin/secrets/final_solutions/supermatter_cascade.dm rename to code/modules/admin/secrets/roundending_secrets/supermatter_cascade.dm index 5d5aa2efd09..9629400574b 100644 --- a/code/modules/admin/secrets/final_solutions/supermatter_cascade.dm +++ b/code/modules/admin/secrets/roundending_secrets/supermatter_cascade.dm @@ -1,7 +1,7 @@ -/datum/admin_secret_item/final_solution/supermatter_cascade +/datum/admin_secret_item/round_ending_secret/supermatter_cascade name = "Supermatter Cascade" -/datum/admin_secret_item/final_solution/supermatter_cascade/execute(var/mob/user) +/datum/admin_secret_item/round_ending_secret/supermatter_cascade/execute(var/mob/user) . = ..() if(!.) return diff --git a/html/changelogs/RoundEndingSecretRename - ASmallCuteCat.yml b/html/changelogs/RoundEndingSecretRename - ASmallCuteCat.yml new file mode 100644 index 00000000000..9d63326fc03 --- /dev/null +++ b/html/changelogs/RoundEndingSecretRename - ASmallCuteCat.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: ASmallCuteCat + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - admin: "The category of admin commands which trigger round-ending events has been renamed to Round-Ending Secrets."