Merge remote-tracking branch 'upstream/master'

someone543 · Dec 3, 2023 · 24122da · 24122da
2 parents c03c485 + dec385d
commit 24122da
Show file tree

Hide file tree

Showing 564 changed files with 200,597 additions and 51,565 deletions.
diff --git a/.github/workflows/compile_changelogs.yml b/.github/workflows/compile_changelogs.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Python setup
         uses: actions/setup-python@v1
         with:
-          python-version: "3.9"
+          python-version: "3.11"
       - name: Install depends
         run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Python setup
         uses: actions/setup-python@v1
         with:
-          python-version: "3.9"
+          python-version: "3.11"
       - name: Setup cache
         id: cache-spacemandmm
         uses: actions/cache@v2

diff --git a/.github/workflows/make_changelogs.yml b/.github/workflows/make_changelogs.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Python setup
         uses: actions/setup-python@v1
         with:
-          python-version: "3.9"
+          python-version: "3.11"
       - name: Install depends
         run: |
           python -m pip install --upgrade pip

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/RandomRooms/10x5/sk_rdm161_kilovault.dmm b/_maps/RandomRooms/10x5/sk_rdm161_kilovault.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
diff --git a/_maps/RuinGeneration/13x13_shotelroom.dmm b/_maps/RuinGeneration/13x13_shotelroom.dmm
diff --git a/_maps/RuinGeneration/9x13_vault.dmm b/_maps/RuinGeneration/9x13_vault.dmm
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,