Merge remote-tracking branch 'Upstream/master' into Aetherwhisp-Touchups

BeeStation · Jul 28, 2023 · 879e7ab · 879e7ab
2 parents 9375173 + da07e68
commit 879e7ab
Show file tree

Hide file tree

Showing 75 changed files with 2,011 additions and 877 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,

diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp1.dmm
diff --git a/_maps/map_files/Atlas/atlas2.dmm b/_maps/map_files/Atlas/atlas2.dmm