Merge branch 'master' into translate

.github/workflows/render_nanomaps.yml

@@ -6,46 +6,45 @@
 name: 'Render Nanomaps'
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 jobs:
   generate_maps:
     name: 'Generate NanoMaps'
     runs-on: ubuntu-22.04
     steps:
-    - id: create_token
-      uses: actions/create-github-app-token@v1
-      with:
-        app-id: ${{ secrets.APP_ID }}
-        private-key: ${{ secrets.PRIVATE_KEY }}
+      - id: create_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.PRIVATE_KEY }}
 
-    - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"
+      - run: echo "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV"
 
-    - name: 'Update Branch'
-      uses: actions/checkout@v4
-      with:
-        token: ${{ steps.create_token.outputs.token }}
+      - name: 'Update Branch'
+        uses: actions/checkout@v4
+        with:
+          token: ${{ steps.create_token.outputs.token }}
 
-    - name: Branch
-      run: |
-        git branch -f nanomap-render
-        git checkout nanomap-render
-        git reset --hard origin/master
+      - name: Branch
+        run: |
+          git branch -f nanomap-render
+          git checkout nanomap-render
+          git reset --hard origin/master
 
-    - name: 'Generate Maps'
-      run: './tools/github-actions/nanomap-renderer-invoker.sh'
+      - name: 'Generate Maps'
+        run: './tools/github-actions/nanomap-renderer-invoker.sh'
 
-    - name: 'Commit Maps and open PR'
-      run: |
-        git config --local user.email "[email protected]"
-        git config --local user.name "NanoMap Generation"
-        git pull origin master
-        git commit -m "NanoMap Auto-Update (`date`)" -a || true
-        git push -f -u origin nanomap-render
-        result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps,:scroll: CL не требуется" -H "nanomap-render" -B "master" 2>&1) || true
-        echo "$result"
-        if echo "$result" | grep -q "No commits between master and nanomap-render"; then
-          echo "No NanoMaps update required, skipping."
-          exit 78
-        fi
+      - name: 'Commit Maps and open PR'
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "NanoMap Generation"
+          git pull origin master
+          git commit -m "NanoMap Auto-Update (`date`)" -a || true
+          git push -f -u origin nanomap-render
+          result=$(gh pr create -t "Automatic NanoMap Update" -b "This pull request updates the server NanoMaps. Please review the diff images before merging." -l "NanoMaps" -H "nanomap-render" -B "master" 2>&1) || true
+          echo "$result"
+          if echo "$result" | grep -q "No commits between master and nanomap-render"; then
+            echo "No NanoMaps update required, skipping."
+          fi

SQL/paradise_schema.sql

@@ -280,6 +280,7 @@ CREATE TABLE `player` (
   `default_slot` smallint(4) DEFAULT '1',
   `toggles` int(11) DEFAULT NULL,
   `toggles_2` int(11) DEFAULT NULL,
+  `toggles_3` int(11) DEFAULT NULL,
   `sound` mediumint(8) DEFAULT '31',
   `light` MEDIUMINT(3) NOT NULL DEFAULT '7',
   `glowlevel` TINYINT(1) NOT NULL DEFAULT '1',

SQL/updates/61-62.sql

@@ -0,0 +1,4 @@
+# Updating the SQL from version 61 to version 12. -AffectedArc07
+# Adds a new bitflag column for toggles
+
+ALTER TABLE `player` ADD COLUMN `toggles_3` INT NULL DEFAULT NULL AFTER `toggles_2`;

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_winter.dmm

@@ -169,7 +169,7 @@
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aL" = (
-/obj/mecha/working/ripley/mining,
+/obj/mecha/working/ripley/mining/old,
 /turf/simulated/floor/wood,
 /area/ruin/powered/snow_cabin)
 "aM" = (