Merge branch 'testing-mushroom' into jelly-people

BeeStation · Aug 10, 2023 · 346da7d · 346da7d
2 parents d37e08b + 2186a08
commit 346da7d
Show file tree

Hide file tree

Showing 493 changed files with 17,371 additions and 5,030 deletions.
diff --git a/SQL/beestation_schema.sql b/SQL/beestation_schema.sql
@@ -84,37 +84,72 @@ DROP TABLE IF EXISTS `SS13_characters`;
 CREATE TABLE IF NOT EXISTS `SS13_characters` (
 	`slot` INT(11) UNSIGNED NOT NULL,
 	`ckey` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`species` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`real_name` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`name_is_always_random` TINYINT(1) NOT NULL,
-	`body_is_always_random` TINYINT(1) NOT NULL,
-	`gender` VARCHAR(16) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`age` TINYINT(3) UNSIGNED NOT NULL,
-	`hair_color` VARCHAR(8) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`gradient_color` VARCHAR(8) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`facial_hair_color` VARCHAR(8) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`eye_color` VARCHAR(8) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`skin_tone` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`hair_style_name` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`gradient_style` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`facial_style_name` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`underwear` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`underwear_color` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`undershirt` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`socks` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`backbag` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`jumpsuit_style` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`uplink_loc` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`features` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
-	`custom_names` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
-	`helmet_style` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`preferred_ai_core_display` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`preferred_security_department` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`joblessrole` TINYINT(4) UNSIGNED NOT NULL,
-	`job_preferences` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
-	`all_quirks` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
-	`equipped_gear` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
-	`role_preferences` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
+	`species` VARCHAR(32) COLLATE 'utf8mb4_general_ci',
+	`real_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`human_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`mime_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`clown_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`cyborg_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`ai_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`religion_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`deity_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`bible_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`name_is_always_random` TINYINT(1),
+	`body_is_always_random` TINYINT(1),
+	`gender` VARCHAR(16) COLLATE 'utf8mb4_general_ci',
+	`body_model` VARCHAR(16) COLLATE 'utf8mb4_general_ci',
+	`body_size` VARCHAR(16) COLLATE 'utf8mb4_general_ci',
+	`age` TINYINT(3) UNSIGNED,
+	`hair_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`gradient_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`facial_hair_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`eye_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`skin_tone` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`hair_style_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`gradient_style` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`facial_style_name` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`underwear` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`underwear_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`undershirt` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`socks` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`backbag` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`jumpsuit_style` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`uplink_loc` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`pda_theme` VARCHAR(32) COLLATE 'utf8mb4_general_ci',
+	`pda_classic_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`feature_apid_stripes` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_apid_antenna` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_apid_headstripes` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_moth_antennae` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_moth_markings` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_moth_wings` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_ethcolor` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_insect_type` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_ipc_screen` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_ipc_antenna` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_ipc_chassis` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_ipc_screen_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`feature_ipc_antenna_color` VARCHAR(8) COLLATE 'utf8mb4_general_ci',
+	`feature_lizard_body_markings` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_lizard_frills` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_lizard_horns` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_lizard_legs` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_lizard_snout` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_lizard_spines` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_lizard_tail` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_mcolor` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_human_tail` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`feature_human_ears` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+  `feature_psyphoza_cap` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`helmet_style` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`preferred_ai_core_display` VARCHAR(64) COLLATE 'utf8mb4_general_ci',
+	`preferred_security_department` VARCHAR(32) COLLATE 'utf8mb4_general_ci',
+	`joblessrole` TINYINT(4) UNSIGNED,
+	`job_preferences` MEDIUMTEXT COLLATE 'utf8mb4_general_ci',
+	`all_quirks` MEDIUMTEXT COLLATE 'utf8mb4_general_ci',
+	`equipped_gear` MEDIUMTEXT COLLATE 'utf8mb4_general_ci',
+	`role_preferences` MEDIUMTEXT COLLATE 'utf8mb4_general_ci',
+	`randomise` MEDIUMTEXT COLLATE 'utf8mb4_general_ci',
 	PRIMARY KEY (`slot`, `ckey`) USING BTREE
 ) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
 
@@ -408,7 +443,7 @@ CREATE TABLE IF NOT EXISTS `SS13_poll_vote` (
 DROP TABLE IF EXISTS `SS13_preferences`;
 CREATE TABLE `SS13_preferences` (
 	`ckey` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`preference_tag` INT(11) NOT NULL,
+	`preference_tag` VARCHAR(255) NOT NULL COLLATE 'utf8mb4_general_ci',
 	`preference_value` MEDIUMTEXT NULL COLLATE 'utf8mb4_general_ci',
 	UNIQUE INDEX `prefbinding` (`ckey`, `preference_tag`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
@@ -456,7 +491,7 @@ CREATE TABLE IF NOT EXISTS `SS13_schema_revision` (
   `date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`major`,`minor`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (6, 1);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 0);
 
 
 

diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt
@@ -1,15 +1,26 @@
 Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
 
-The latest database version is 6.2; The query to update the schema revision table is:
+The latest database version is 7.0; The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (6, 2);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (7, 0);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (6, 2);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (7, 0);
 
 In any query remember to add a prefix to the table names if you use one.
 
 -----------------------------------------------------
 
+-----------------------------------------------------
+
+Version 7.0, 24 July 2023, by itsmeow
+Datumized preferences (TGUI Prefs)
+
+See prefs_migartion_2023-07-26.sql
+
+-----------------------------------------------------
+
+-----------------------------------------------------
+
 Version 6.2 - 16 June 2023 by itsmeow
 Add per-character role preferences.