Chore(deps): Bump pillow from 9.0.1 to 9.3.0 in /tools/mapmerge2

.github/workflows/ci_suite.yml

@@ -2,10 +2,10 @@ name: CI Suite
 on:
   push:
     branches:
-    - master
+    - master220
   pull_request:
     branches:
-    - master
+    - master220
 jobs:
   run_linters:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"

.github/workflows/compile_changelogs.yml

@@ -44,11 +44,11 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Changelogs"
-          git pull origin master
+          git pull origin master220
           git add html/changelogs
           git commit -m "Automatic changelog compile [ci skip]" -a || true
       - name: "Push"
-        if: steps.value_holder.outputs.ACTIONS_ENABLED
-        uses: ad-m/github-push-action@master
+        if: steps.value_holder.outputs.CL_ENABLED
+        uses: ad-m/github-push-action@master220
         with:
           github_token: ${{ secrets.COMFY_ORANGE_PAT || secrets.GITHUB_TOKEN }}

.github/workflows/conflicts.yml

@@ -2,7 +2,7 @@ name: 'Check for merge conflicts'
 on:
   push:
     branches:
-      - master
+      - master220
 jobs:
   triage:
     runs-on: ubuntu-20.04

.github/workflows/generate_documentation.yml

@@ -2,7 +2,7 @@ name: Generate documentation
 on:
   push:
     branches:
-    - master
+    - master220
 permissions:
   contents: read
 

.github/workflows/label_merge_conflicts.yml

@@ -0,0 +1,14 @@
+name: 'Merge Conflict Detection'
+on:
+  push:
+    branches:
+      - master220
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mschilde/auto-label-merge-conflicts@master
+        with:
+          CONFLICT_LABEL_NAME: 'Merge Conflict'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WAIT_MS: 10000

.github/workflows/round_id_linker.yml

@@ -7,6 +7,6 @@ jobs:
   link_rounds:
     runs-on: ubuntu-20.04
     steps:
-    - uses: tgstation/round_linker@master
+    - uses: tgstation/round_linker@master220
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update_tgs_dmapi.yml

@@ -17,7 +17,7 @@ jobs:
       run: |
         git branch -f tgs-dmapi-update
         git checkout tgs-dmapi-update
-        git reset --hard master
+        git reset --hard master220
 
     - name: Apply DMAPI update
       uses: tgstation/tgs-dmapi-updater@v2
@@ -39,7 +39,7 @@ jobs:
       if: ${{ success() }}
       with:
         source_branch: "tgs-dmapi-update"
-        destination_branch: "master"
+        destination_branch: "master220"
         pr_title: "Automatic TGS DMAPI Update"
         pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any breaking or unimplemented changes before merging."
         pr_label: "Tools"

SQL/tgmc-schema.sql

@@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `admin` (
   `ckey` varchar(32) NOT NULL,
   `rank` varchar(32) NOT NULL,
   PRIMARY KEY (`ckey`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.admin_log
@@ -30,7 +30,7 @@ CREATE TABLE IF NOT EXISTS `admin_log` (
   `target` varchar(32) NOT NULL,
   `log` varchar(1000) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.admin_ranks
@@ -40,7 +40,7 @@ CREATE TABLE IF NOT EXISTS `admin_ranks` (
   `exclude_flags` smallint(5) unsigned NOT NULL,
   `can_edit_flags` smallint(5) unsigned NOT NULL,
   PRIMARY KEY (`rank`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.ban
@@ -72,7 +72,7 @@ CREATE TABLE IF NOT EXISTS `ban` (
   KEY `idx_ban_isbanned` (`ckey`,`role`,`unbanned_datetime`,`expiration_time`),
   KEY `idx_ban_isbanned_details` (`ckey`,`ip`,`computerid`,`role`,`unbanned_datetime`,`expiration_time`),
   KEY `idx_ban_count` (`bantime`,`a_ckey`,`applies_to_admins`,`unbanned_datetime`,`expiration_time`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.connection_log
@@ -86,7 +86,7 @@ CREATE TABLE IF NOT EXISTS `connection_log` (
   `ip` int(10) unsigned NOT NULL,
   `computerid` varchar(45) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.death
@@ -117,7 +117,7 @@ CREATE TABLE IF NOT EXISTS `death` (
   `last_words` varchar(255) DEFAULT NULL,
   `suicide` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.feedback
@@ -130,7 +130,7 @@ CREATE TABLE IF NOT EXISTS `feedback` (
   `key_type` enum('text','amount','tally','nested tally','associative') NOT NULL,
   `json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.messages
@@ -157,7 +157,7 @@ CREATE TABLE IF NOT EXISTS `messages` (
   KEY `idx_msg_ckey_time` (`targetckey`,`timestamp`,`deleted`),
   KEY `idx_msg_type_ckeys_time` (`type`,`targetckey`,`adminckey`,`timestamp`,`deleted`),
   KEY `idx_msg_type_ckey_time_odr` (`type`,`targetckey`,`timestamp`,`deleted`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.player
@@ -176,7 +176,7 @@ CREATE TABLE IF NOT EXISTS `player` (
   PRIMARY KEY (`ckey`),
   KEY `idx_player_cid_ckey` (`computerid`,`ckey`),
   KEY `idx_player_ip_ckey` (`ip`,`ckey`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.poll_option
@@ -193,7 +193,7 @@ CREATE TABLE IF NOT EXISTS `poll_option` (
   `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `idx_pop_pollid` (`pollid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.poll_question
@@ -216,7 +216,7 @@ CREATE TABLE IF NOT EXISTS `poll_question` (
   KEY `idx_pquest_question_time_ckey` (`question`,`starttime`,`endtime`,`createdby_ckey`,`createdby_ip`),
   KEY `idx_pquest_time_deleted_id` (`starttime`,`endtime`, `deleted`, `id`),
   KEY `idx_pquest_id_time_type_admin` (`id`,`starttime`,`endtime`,`polltype`,`adminonly`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.poll_textreply
@@ -231,7 +231,7 @@ CREATE TABLE IF NOT EXISTS `poll_textreply` (
   `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `idx_ptext_pollid_ckey` (`pollid`,`ckey`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.poll_vote
@@ -248,7 +248,7 @@ CREATE TABLE IF NOT EXISTS `poll_vote` (
   PRIMARY KEY (`id`),
   KEY `idx_pvote_pollid_ckey` (`pollid`,`ckey`),
   KEY `idx_pvote_optionid_ckey` (`optionid`,`ckey`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.role_time
@@ -257,7 +257,7 @@ CREATE TABLE IF NOT EXISTS `role_time` (
   `job` varchar(32) NOT NULL,
   `minutes` int(10) unsigned NOT NULL,
   PRIMARY KEY (`ckey`,`job`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.role_time_log
@@ -271,7 +271,7 @@ CREATE TABLE IF NOT EXISTS `role_time_log` (
   KEY `ckey` (`ckey`),
   KEY `job` (`job`),
   KEY `datetime` (`datetime`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.round
@@ -289,7 +289,7 @@ CREATE TABLE IF NOT EXISTS `round` (
   `end_state` varchar(64) DEFAULT NULL,
   `map_name` varchar(32) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.schema_revision
@@ -298,7 +298,7 @@ CREATE TABLE IF NOT EXISTS `schema_revision` (
   `minor` tinyint(3) unsigned NOT NULL,
   `date` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`major`,`minor`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- Data exporting was unselected.
 -- Dumping structure for table feedback.stickyban
@@ -308,7 +308,7 @@ CREATE TABLE IF NOT EXISTS `stickyban` (
   `banning_admin` varchar(32) NOT NULL,
   `datetime` datetime NOT NULL DEFAULT current_timestamp(),
   PRIMARY KEY (`ckey`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 --
 -- Table structure for table `stickyban_matched_ckey`

_maps/_basemap.dm

@@ -16,11 +16,14 @@
 		#include "map_files\Pillar_of_Spring\TGS_Pillar_of_Spring.dmm"
 		#include "map_files\icy_caves\icy_caves.dmm"
 		#include "map_files\Research_Outpost\Research_Outpost.dmm"
+		#include "map_files\Barrenquilla_Mining\Barrenquilla_Mining_Facility.dmm"
 		#include "map_files\Magmoor_Digsite_IV\Magmoor_Digsite_IV.dmm"
 		#include "map_files\Orion_Military_Outpost\orionoutpost.dmm"
 		#include "map_files\Twin_Pillars\Twin_Pillars.dmm"
 		#include "map_files\Minerva\TGS_Minerva.dmm"
 		#include "map_files\gelida_iv\gelida_iv.dmm"
+		#include "map_files\Talos\TGS_Talos.dmm"
+		#include "map_files\Twin_Pillars_ss220_edition\Twin_Pillars_ss220_edition.dmm"
 		#ifdef CIBUILDING
 			#include "templates.dm"
 		#endif

_maps/barrenquilla_mining.json

@@ -0,0 +1,6 @@
+{
+    "map_name": "Barrenquilla Mining Facility",
+    "map_path": "map_files/Barrenquilla_Mining",
+    "map_file": "Barrenquilla_Mining_Facility.dmm",
+    "announce_text": "A faint distress signal has been picked up by our scanners, which have tracked the source to LO145. Through use of emergency bluespace drive tech, the ###SHIPNAME### has jumped within range of the outpost. Senior officers are present and will need to be evacuated in order to completely finish your mission. TGMC, gear up and get ready to respond!"
+}