Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

2022-01-11 09:49:38 +08:00
parent 08e3674678 7bae2cdab3
commit 18b7069f1f
84 changed files with 5101 additions and 3151 deletions
@@ -503,3 +503,6 @@ PAI_CUSTOM_HOLOFORMS

 ## Enables monstermos/"equalization" step in atmos.
 # ATMOS_EQUALIZATION_ENABLED
+
+## Do station renames from the station charter require admin approval to pass, as opposed to autoapproving if not denied.
+STATION_NAME_NEEDS_APPROVAL