Merge remote-tracking branch 'origin/master' into revert-26660

.github/labeler.yml

@@ -54,20 +54,20 @@
           - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**', 'tgui/**']
           - any-glob-to-any-file: [modular_ss220/**]
       - base-branch: 'master'
-      - head-branch: '^(?!merge-upstream$).*'
+      - head-branch: '^(?!merge[-_]upstream$).*'
 
 ':finnadie: НЕ МОДУЛЬНО':
   - all:
       - changed-files:
           - any-glob-to-any-file: ['code/**', 'icons/**', 'sounds/**', '_maps/map_files/**']
           - all-globs-to-all-files: '!modular_ss220/**'
       - base-branch: 'master'
-      - head-branch: '^(?!merge-upstream$).*'
+      - head-branch: '^(?!merge[-_]upstream$).*'
 
 ':pray: Слияние с восходящим потоком':
   - all:
       - base-branch: 'master'
-      - head-branch: 'merge-upstream'
+      - head-branch: 'merge[-_]upstream'
 
 ':pencil: Перевод':
   - base-branch: 'translate'

.github/workflows/build_milla.yml → .github/workflows/build_rust.yml

@@ -1,13 +1,13 @@
-name: Build MILLA
+name: Build Rust library
 on:
   issue_comment:
     types: created
 
 jobs:
-  build-milla:
+  build-rust:
     if: |
       github.event.issue.pull_request &&
-      (github.event.comment.body == '!build_milla') &&
+      (github.event.comment.body == '!build_rust') &&
       ((github.event.sender.id == github.event.issue.user.id) ||
       (github.event.comment.author_association == 'COLLABORATOR') ||
       (github.event.comment.author_association == 'MEMBER') ||
@@ -53,7 +53,7 @@ jobs:
           ref: ${{ env.PR_BRANCH }}
           token: ${{ env.GH_TOKEN }}
 
-      - name: Build MILLA
+      - name: Build rustlibs
         env:
           BASE_BRANCH: ${{ github.event.repository.default_branch }}
           BASE_REPOSITORY: ${{ github.repository }}
@@ -65,7 +65,7 @@ jobs:
           git pull origin "$PR_BRANCH" --depth=$((ahead_by + 1))
           git remote add upstream "https://github.com/$BASE_REPOSITORY.git"
           git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1))
-          cd milla
+          cd rust
 
           # Get dependencies.
           rustup target add i686-unknown-linux-gnu
@@ -79,13 +79,13 @@ jobs:
           cargo build --release --target i686-pc-windows-gnu
 
           # Copy the built targets to their checked-in locations.
-          cp target/i686-unknown-linux-gnu/release/libmilla.so ../tools/ci/libmilla_ci.so
-          cp target/i686-pc-windows-gnu/release/milla.dll ../milla.dll
+          cp target/i686-unknown-linux-gnu/release/librustlibs.so ../tools/ci/librustlibs_ci.so
+          cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs.dll
 
-          git commit -a -m "Build MILLA" --allow-empty
+          git commit -a -m "Build Rust library" --allow-empty
           git push origin
 
       - name: Notify Failure
         if: failure() && env.FAIL_NOTIFIED != 'true'
         run: |
-          gh pr comment ${{ github.event.issue.html_url }} -b 'Building MILLA failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
+          gh pr comment ${{ github.event.issue.html_url }} -b 'Building Rust library failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'

.gitignore

@@ -73,7 +73,7 @@ $RECYCLE.BIN
 *.swp
 
 # Rust output.
-/milla/target/*
+/rust/target/*
 
 # mkdocs output.
 site

SQL/paradise_schema.sql

@@ -250,7 +250,7 @@ CREATE TABLE `feedback` (
   `datetime` datetime NOT NULL,
   `round_id` int(8) NOT NULL,
   `key_name` varchar(32) NOT NULL,
-  `key_type` enum('text', 'amount', 'tally', 'nested tally', 'associative') NOT NULL,
+  `key_type` ENUM('text', 'amount', 'tally', 'nested tally', 'associative', 'ledger', 'nested ledger') NOT NULL,
   `version` tinyint(3) UNSIGNED NOT NULL,
   `json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
   PRIMARY KEY (`id`)

SQL/updates/59-60.sql

@@ -0,0 +1,23 @@
+-- Migration:  59-60
+-- Author:     warriorstar
+-- Introduced: PR# 26645
+
+-- This migration adds the 'ledger' and 'nested ledger' enum values to the
+-- `feedback` table in conjunction with making those feedback types available
+-- through SSblackbox.
+-- No data migration is required.
+
+ALTER TABLE
+	`feedback`
+MODIFY
+	COLUMN `key_type` ENUM(
+		'text',
+		'amount',
+		'tally',
+		'nested tally',
+		'associative',
+		'ledger',
+		'nested ledger'
+	) NOT NULL
+AFTER
+	`key_name`;

_maps/base_map.dm

@@ -1,5 +1,17 @@
-#include "map_files220\generic\centcomm.dmm" // SS220 EDIT - ORIGINAL: #include "map_files\generic\centcomm.dmm"
-#include "map_files220\generic\Admin_Zone.dmm" // SS220 ADDITION
+/**
+ * SS220 EDIT - START
+ * ORIGINAL: #include "map_files\generic\centcomm.dmm"
+ * Uncomment define bellow if you need faster init for testing.
+ */
+//#define ENABLE_TEST_CC
+
+#ifndef ENABLE_TEST_CC
+#include "map_files220\generic\centcomm.dmm"
+#include "map_files220\generic\Admin_Zone.dmm"
+#else
+#include "map_files220\generic\centcomm_test.dmm"
+#endif
+// SS220 EDIT - END
 #define CC_TRANSITION_CONFIG DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC))
 #ifdef CIMAP
 #include "ci_map_testing.dm"