Merge conflict resolve

BeeStation · Aug 11, 2023 · d7d4fcf · d7d4fcf
2 parents c7b2192 + 8c9bad6
commit d7d4fcf
Show file tree

Hide file tree

Showing 96 changed files with 43,640 additions and 42,577 deletions.
diff --git a/SQL/beestation_schema.sql b/SQL/beestation_schema.sql
@@ -118,6 +118,10 @@ CREATE TABLE IF NOT EXISTS `SS13_characters` (
 	`preferred_pilot_role` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
 	`flavor_text` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
 	`lizard_hiss_style` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`silicon_flavor_text` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
+	`general_record` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
+	`security_record` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
+	`medical_record` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
 	PRIMARY KEY (`slot`, `ckey`) USING BTREE
 ) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
 

diff --git a/_maps/atlas.json b/_maps/atlas.json
@@ -21,7 +21,6 @@
     "shuttles": {
         "cargo": "cargo_atlas",
         "ferry": "ferry_fancy",
-        "arrival": "arrival_atlas",
         "emergency": "emergency_atlas"
     },
     "mine_disable": 1,