Merge remote-tracking branch 'upstream/master'

SPLURT-Station · Oct 17, 2024 · f60ced2 · f60ced2
2 parents 7351a79 + 104002d
commit f60ced2
Show file tree

Hide file tree

Showing 313 changed files with 8,519 additions and 1,761 deletions.
diff --git a/SQL/bubber_schema.sql b/SQL/bubber_schema.sql
@@ -22,3 +22,14 @@ CREATE TABLE `jobexempt` (
   PRIMARY KEY (`ckey`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
+
+
+DROP TABLE IF EXISTS `vetted_list`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vetted_list` (
+  `ckey` varchar(32) NOT NULL,
+  `admin_who_added` VARCHAR(32) DEFAULT NULL,
+  PRIMARY KEY (`ckey`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/SQL/database_changelog.md b/SQL/database_changelog.md
@@ -2,10 +2,10 @@ Any time you make a change to the schema files, remember to increment the databa
 
 Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`.
 
-The latest database version is 5.30 (5.27 for /tg/); The query to update the schema revision table is:
+The latest database version is 5.31 (for bubberstation, 5.30 for skyrat) (5.27 for /tg/); The query to update the schema revision table is:
 
 ```sql
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 30);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 31);
 ```
 or