Kmc2000 · covertcorvid · Aug 18, 2023 · Aug 18, 2023 · Aug 18, 2023 · Aug 23, 2023
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/extra_pr_labels.yml b/.github/workflows/extra_pr_labels.yml
@@ -19,7 +19,7 @@ jobs:
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
       - name: Apply labels based on changed files
         if: github.event_name != 'push'
-        uses: actions/labeler@main
+        uses: actions/labeler@v4.3.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

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/.vscode/settings.json b/.vscode/settings.json
@@ -10,7 +10,7 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,

diff --git a/SQL/beestation_schema.sql b/SQL/beestation_schema.sql
@@ -117,6 +117,12 @@ CREATE TABLE IF NOT EXISTS `SS13_characters` (
 	`preferred_squad` VARCHAR(32) NOT NULL COLLATE 'utf8mb4_general_ci',
 	`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',
+	`role_preferences` MEDIUMTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
 	PRIMARY KEY (`slot`, `ckey`) USING BTREE
 ) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
 
@@ -457,7 +463,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 (6, 2);
 
 
 

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/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
diff --git a/_maps/RuinGeneration/13x13_shotelroom.dmm b/_maps/RuinGeneration/13x13_shotelroom.dmm
diff --git a/_maps/RuinGeneration/13x9_cratestorage.dmm b/_maps/RuinGeneration/13x9_cratestorage.dmm
diff --git a/_maps/RuinGeneration/9x13_vault.dmm b/_maps/RuinGeneration/9x13_vault.dmm
diff --git a/_maps/aetherwhisp.json b/_maps/aetherwhisp.json
@@ -11,7 +11,7 @@
 		"ferry": "ferry_kilo",
 	    "emergency": "emergency_donut"},
 	"mine_disable": 1,
-	"ship_type": "/obj/structure/overmap/nanotrasen/solgov/aetherwhisp/starter",
+    "ship_type": "/datum/overmap/ship/player",
 	"faction": "solgov",
 	"starmap_path": "config/starmap/starmap.json",
 

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/eclipse.json b/_maps/eclipse.json
@@ -11,7 +11,7 @@
         "ferry": "ferry_fancy",
         "emergency": "emergency_donut"},
     "mine_disable": 1,
-    "ship_type": "/obj/structure/overmap/nanotrasen/light_cruiser/starter",
+    "ship_type": "/datum/overmap/ship/player",
 	"starmap_path": "config/starmap/starmap.json",
 
     "map_description": "The standard issue Eclipse ship was once sold to the civilian population equipped with amenities befitting the standard consumer. It was later decommissioned for safety concerns regarding small atmos tanks and inadequate hull plating. The vessels are now bought by WhiteRapids, outfitted with appropriate weaponry, robust plating, and other installations to meet minimum shipbuilding standards.",

diff --git a/_maps/galactica.json b/_maps/galactica.json
@@ -26,7 +26,7 @@
 	"mine_disable": 0,
 	"mine_file": "Rocinante.dmm",
 	"mine_path": "map_files/Mining/nsv13",
-	"ship_type": "/obj/structure/overmap/nanotrasen/battleship/starter",
+    "ship_type": "/datum/overmap/ship/player",
 	"mining_ship_type": "/obj/structure/overmap/nanotrasen/mining_cruiser/rocinante",
 	"starmap_path": "config/starmap/starmap.json",
 

diff --git a/_maps/gladius.json b/_maps/gladius.json
@@ -21,7 +21,7 @@
 	    "emergency": "emergency_donut"},
     "mine_file": "Rocinante.dmm",
     "mine_path": "map_files/Mining/nsv13",
-	"ship_type": "/obj/structure/overmap/nanotrasen/battlecruiser/starter",
+    "ship_type": "/datum/overmap/ship/player",
 	"mining_ship_type": "/obj/structure/overmap/nanotrasen/mining_cruiser/rocinante",
 	"starmap_path": "config/starmap/starmap.json",