Merge remote-tracking branch 'upstream/master'

.github/workflows/deploy.yml

@@ -0,0 +1,24 @@
+name: Deploy
+
+concurrency:
+  group: deploy
+
+on:
+  workflow_dispatch:
+  push:
+    branches: ['master, devtest']
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Trigger update
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.GAME1_HOST }}
+          username: ${{ secrets.GAME1_USERNAME }}
+          key: ${{ secrets.GAME1_SSH_KEY }}
+          script: |
+            cd /opt/ss13/paradise/
+            ./upgrade.sh

.github/workflows/label_merge_conflicts.yml

@@ -1,13 +1,19 @@
 name: 'Merge Conflict Detection'
+
 on:
   push:
     branches:
       - master
+  pull_request_target:
+    types: [ready_for_review, opened, synchronize, reopened]
 jobs:
   triage:
-    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-22.04
     steps:
-      - uses: mschilde/auto-label-merge-conflicts@master
+      - uses: eps1lon/actions-label-merge-[email protected]
         with:
-          CONFLICT_LABEL_NAME: 'Merge Conflict'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          dirtyLabel: 'Merge Conflict'
+          repoToken: ${{ secrets.GITHUB_TOKEN }}

SQL/updates220/50.220.3-50.220.4.sql

@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS `discord_links` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `ckey` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `discord_id` bigint(20) DEFAULT NULL,
+  `timestamp` timestamp NOT NULL DEFAULT current_timestamp(),
+  `one_time_token` varchar(100) NOT NULL,
+  `valid` tinyint(1) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

_maps/base_map.dm

@@ -1,4 +1,5 @@
-#include "map_files220\generic\centcomm.dmm" //SS220 EDIT - ORIGINAL: #include "map_files\generic\centcomm.dmm"
+#include "map_files220\generic\centcomm.dmm" // SS220 EDIT - ORIGINAL: #include "map_files\generic\centcomm.dmm"
+#include "map_files220\generic\Admin_Zone.dmm" // SS220 ADDITION
 #define CC_TRANSITION_CONFIG DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC))
 #ifdef CIMAP
 #include "ci_map_testing.dm"