Merge branch 'master' into ert

.vscode/extensions.json

@@ -7,6 +7,8 @@
 		"stylemistake.auto-comment-blocks",
 		"Donkie.vscode-tgstation-test-adapter",
 		"anturk.dmi-editor",
-		"esbenp.prettier-vscode"
+		"esbenp.prettier-vscode",
+		"emilast.LogFileHighlighter",
+		"earshinov.filter-lines"
 	]
 }

.vscode/settings.json

@@ -26,5 +26,63 @@
 	"workbench.editorAssociations": {
 		"*.dmi": "dmiEditor.dmiEditor"
 	},
-	"Lua.diagnostics.enable": false
+	"Lua.diagnostics.enable": false,
+	"logFileHighlighter.customPatterns": [
+		{
+			"pattern": "(GAME: )?(RUNTIME|DYNAMIC: FAIL|SUSPICIOUS_LOGINS|ADMINPRIVATE): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FF0000",
+			"fontStyle": "bold"
+		},
+		{
+			"pattern": "(GAME: )?(RUNTIME|DYNAMIC: FAIL): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"background": "#550000"
+		},
+		{
+			"pattern": "(GAME: )?ADMIN(: (Announce|PRIVATE|PRIVATE-ASAY|PRIVATE: PM)?)?: .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FF8000"
+		},
+		{
+			"pattern": "(GAME: )?GAME-ACCESS(: (Login|Logout|Mob Login)?): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FFB84D"
+		},
+		{
+			"pattern": "(GAME: )?(DEBUG-(MAPPING|MOBTAG: TAG)|CAVE-GENERATION|CONFIG|ECONOMY|Station Trait): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#FFD700"
+		},
+		{
+			"pattern": "(GAME: )?(HREF-TGUI|HREF|MANIFEST|MECHA|PAPER|PDA): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#0099CC"
+		},
+		{
+			"pattern": "(GAME: )?(SHUTTLE|SIGNAL|SILICON(: (CYBORG|LAW)?)?|SILO|TRANSPORT(: (PE8VN|Sub|TC|VkLiD)?)?|TOOL|TELECOMMS): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#14A833"
+		},
+		{
+			"pattern": "(GAME: )?(UPLINK(-CHANGELING|-HERETIC)?|SPEECH-INDICIATOR|ATTACK): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#AC2EA1"
+		},
+		{
+			"pattern": "(GAME: )?(RU_NAMES_SUGGEST|VIRUS|TARGET-ZONE-SWITCH): .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#A8732B"
+		},
+		{
+			"pattern": "(GAME: )?GAME-OOC: .+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#8888DD"
+		},
+		{
+			"pattern": "GAME:(?! [\\w-]+:).+?(?=\n(\\[|$))",
+			"patternFlags": "s",
+			"foreground": "#666666"
+		}
+	]
 }

SQL/bandastation/bandastation_update.sql

@@ -55,3 +55,21 @@ CREATE TABLE `budget` (
     `discord_id` bigint(20) DEFAULT NULL,
     PRIMARY KEY (`id`) USING BTREE
 ) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
+
+--
+-- Table structure for table `minesweeper`
+--
+DROP TABLE IF EXISTS `minesweeper`;
+CREATE TABLE `minesweeper` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`date` DATETIME NOT NULL DEFAULT current_timestamp(),
+	`ckey` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_unicode_ci',
+	`nickname` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_unicode_ci',
+	`time` INT(10) UNSIGNED NOT NULL,
+	`points` INT(10) UNSIGNED NOT NULL,
+	`points_per_sec` FLOAT(10) UNSIGNED NOT NULL,
+	`width` TINYINT(3) UNSIGNED NOT NULL,
+	`height` TINYINT(3) UNSIGNED NOT NULL,
+	`bombs` TINYINT(3) UNSIGNED NOT NULL,
+	PRIMARY KEY (`id`)
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;

SQL/bandastation/database_changelog.md

@@ -2,17 +2,36 @@ Any time you make a change to the schema files, remember to increment the databa
 
 Make sure to also update `DB_MAJOR_VERSION_220` and `DB_MINOR_VERSION_220`, which can be found in `code/modular_bandastation/_defines220/code/defines/subsystems.dm`.
 
-The latest database version is 1.2; The query to update the schema revision table is:
+The latest database version is 1.3; The query to update the schema revision table is:
 
 ```sql
-INSERT INTO `schema_revision_220` (`major`, `minor`) VALUES (1, 2);
+INSERT INTO `schema_revision_220` (`major`, `minor`) VALUES (1, 3);
 ```
 or
 
 ```sql
-INSERT INTO `SS13_schema_revision_220` (`major`, `minor`) VALUES (1, 2);
+INSERT INTO `SS13_schema_revision_220` (`major`, `minor`) VALUES (1, 3);
 ```
 
+-----------------------------------------------------
+Version 1.3, 29 January 2024, by ROdenFL
+Created the table: minesweeper
+
+```sql
+CREATE TABLE `minesweeper` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`date` DATETIME NOT NULL DEFAULT current_timestamp(),
+	`ckey` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_unicode_ci',
+	`nickname` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_unicode_ci',
+	`time` INT(10) UNSIGNED NOT NULL,
+	`points` INT(10) UNSIGNED NOT NULL,
+	`points_per_sec` FLOAT(10) UNSIGNED NOT NULL,
+	`width` TINYINT(3) UNSIGNED NOT NULL,
+	`height` TINYINT(3) UNSIGNED NOT NULL,
+	`bombs` TINYINT(3) UNSIGNED NOT NULL,
+    PRIMARY KEY (`id`)
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
+```
 -----------------------------------------------------
 Version 1.2, 22 July 2024, by larentoun
 Created the table: budget