Merge branch 'translate' into Translation-of-drinks

.github/workflows/check_changelog.yml

@@ -12,12 +12,14 @@ on:
 jobs:
   CheckCL:
     runs-on: ubuntu-latest
-    if: github.repository == 'ss220club/Paradise-SS220' && github.base_ref == 'master' && github.event.pull_request.draft == false
+    if: github.base_ref == 'master' && github.event.pull_request.draft == false
+
     steps:
       - name: Downloading scripts
         run: |
-          wget https://raw.githubusercontent.com/ss220club/Paradise-SS220/master/tools/changelog/check_changelog.py
-          wget https://raw.githubusercontent.com/ss220club/Paradise-SS220/master/tools/changelog/tags.yml
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/changelog_utils.py
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/check_changelog.py
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.base_ref }}/tools/changelog/tags.yml
       - name: Installing Python
         uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
         with:
@@ -28,5 +30,5 @@ jobs:
           pip install ruamel.yaml PyGithub
       - name: Changelog validation
         env:
-          BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
         run: python check_changelog.py

.github/workflows/ci.yml

@@ -54,6 +54,7 @@ jobs:
           # python tools/ci/no_duplicate_definitions.py # SS220 REMOVAL
           python -m tools.ci.check_icon_conflicts
           python -m tools.ci.check_icon_dupenames
+          python -m tools.ci.check_legacy_attack_chain
           python -m tools.maplint.source --github
 
       - name: Run DreamChecker
@@ -95,7 +96,14 @@ jobs:
     strategy:
       fail-fast: false # Let all map tests run to completion
       matrix:
-        maptype: ['/datum/map/boxstation', '/datum/map/deltastation', '/datum/map/metastation', '/datum/map/cerestation', '/datum/map/emeraldstation']
+        maptype:
+          [
+            '/datum/map/boxstation',
+            '/datum/map/deltastation',
+            '/datum/map/metastation',
+            '/datum/map/cerestation',
+            '/datum/map/emeraldstation',
+          ]
         byondtype: ['STABLE']
     services:
       mariadb:

.github/workflows/devdocs.yml

@@ -15,7 +15,7 @@ jobs:
 
       - name: Build docs
         run: |
-          python -m pip install mkdocs==1.6.0 mkdocs-material[imaging]==9.5.31 mkdocs-github-admonitions-plugin==0.0.2
+          python -m pip install mkdocs==1.6.0 mkdocs-material[imaging]==9.5.31 mkdocs-github-admonitions-plugin==0.0.2 mkdocs-glightbox==0.4.0
           python -m mkdocs build
 
       - name: Deploy docs

.github/workflows/merge_upstream.yml

@@ -0,0 +1,47 @@
+name: Merge Upstream
+
+on:
+  workflow_dispatch:
+
+jobs:
+  merge-upstream:
+    runs-on: ubuntu-latest
+
+    steps:
+      - 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"
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install PyGithub googletrans==4.0.0-rc1
+
+      - name: Download the script
+        run: |
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/changelog/changelog_utils.py
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/merge-upstream/merge_upstream.py
+
+      - name: Run the script
+        env:
+          GITHUB_TOKEN: ${{ env.GH_TOKEN }}
+          TARGET_REPO: 'ss220club/Paradise-SS220'
+          TARGET_BRANCH: 'master'
+          UPSTREAM_REPO: 'ParadiseSS13/Paradise'
+          UPSTREAM_BRANCH: 'master'
+          MERGE_BRANCH: 'merge-upstream'
+          TRANSLATE_CHANGES: 'true'
+          CHANGELOG_AUTHOR: 'ParadiseSS13'
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "Upstream Sync"
+          python3 merge_upstream.py

.github/workflows/render_nanomaps.yml

@@ -43,7 +43,7 @@ jobs:
           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
+          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."

README.md

@@ -120,7 +120,7 @@ TGUI сильно отличается от большинства других
 <details>
 <summary><a href="#"><img src="https://img.shields.io/badge/licence-CC_3.0_BY--NC--SA-blue?style=for-the-badge" alt="Creative Commons 3.0 BY-NC-SA" align="centre"></a></summary>
 
-> Any files with the ancestor directories [`Paradise/icons/goonstation`](icons/goonstation) or [`Paradise/sound/goonstation`](sound/goonstation) are licensed under the [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0).
+> Any files with the ancestor directories [`modular_ss220/aesthetics/goonstation`](modular_ss220/aesthetics/goonstation), [`Paradise/icons/goonstation`](icons/goonstation) or [`Paradise/sound/goonstation`](sound/goonstation) are licensed under the [Creative Commons 3.0 BY-NC-SA license](https://creativecommons.org/licenses/by-nc-sa/3.0).
 >
 > Further files or folders may also fall under this licence, and any such instances will be specified within the folder or file.
 

SQL/paradise_schema.sql

@@ -82,6 +82,7 @@ CREATE TABLE `characters` (
   `custom_emotes` LONGTEXT COLLATE 'utf8mb4_unicode_ci' DEFAULT NULL,
   `runechat_color` VARCHAR(7) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '#FFFFFF',
   `cyborg_brain_type` ENUM('MMI', 'Robobrain', 'Positronic') NOT NULL DEFAULT 'MMI',
+  `pda_ringtone` VARCHAR(16) NULL DEFAULT NULL COLLATE 'utf8mb3_general_ci',
   PRIMARY KEY (`id`),
   KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=125467 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

SQL/updates/62-63.sql

@@ -0,0 +1,5 @@
+# Updates the DB from 62 to 63
+# Adds a PDA ringtone option to character setup
+
+ALTER TABLE `characters`
+	ADD COLUMN `pda_ringtone` VARCHAR(16) NULL DEFAULT NULL AFTER `cyborg_brain_type`;

_maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm

@@ -773,7 +773,7 @@
 /turf/simulated/floor/lubed/lavaland_air,
 /area/ruin/powered/clownplanet)
 "bq" = (
-/obj/machinery/disposal/deliveryChute{
+/obj/machinery/disposal/delivery_chute{
 	dir = 1
 	},
 /obj/structure/disposalpipe/trunk,
@@ -890,7 +890,7 @@
 /turf/simulated/floor/carpet/lavaland_air,
 /area/ruin/powered/clownplanet)
 "bN" = (
-/obj/machinery/disposal/deliveryChute,
+/obj/machinery/disposal/delivery_chute,
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
@@ -1103,7 +1103,7 @@
 /turf/simulated/floor/light/lavaland_air,
 /area/ruin/powered/clownplanet)
 "LH" = (
-/obj/machinery/disposal/deliveryChute{
+/obj/machinery/disposal/delivery_chute{
 	desc = "The following is engraved upon the chute: A FATE WORSE THAN DEATH LIES WITHIN";
 	dir = 1;
 	name = "THE TRIAL OF HONKITUDE"

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm

@@ -1127,7 +1127,7 @@
 "Es" = (
 /obj/structure/lattice/catwalk/mining,
 /obj/effect/mapping_helpers/no_lava,
-/obj/structure/ladder/unusable,
+/obj/structure/ladder,
 /turf/simulated/floor/chasm,
 /area/lavaland/surface/outdoors)
 "Et" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_facility.dmm

@@ -1030,11 +1030,11 @@
 /area/ruin/unpowered/althland_processing)
 "Jw" = (
 /obj/structure/table,
-/obj/item/reagent_containers/drinks/cans/beer{
+/obj/item/reagent_containers/drinks/bottle/beer{
 	pixel_x = 8;
 	pixel_y = 10
 	},
-/obj/item/reagent_containers/drinks/cans/beer,
+/obj/item/reagent_containers/drinks/bottle/beer,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/althland_processing)

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm

@@ -39,7 +39,7 @@
 /area/ruin/powered/pizza_party)
 "k" = (
 /obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/pizzaparty,
+/obj/effect/spawner/random/pizzaparty,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
@@ -48,7 +48,7 @@
 	dir = 4
 	},
 /obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/pizzaparty,
+/obj/effect/spawner/random/pizzaparty,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb2,
 /turf/simulated/floor/wood/lavaland_air,
@@ -111,7 +111,7 @@
 /area/ruin/powered/pizza_party)
 "x" = (
 /obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/pizzaparty,
+/obj/effect/spawner/random/pizzaparty,
 /turf/simulated/floor/wood/lavaland_air,
 /area/ruin/powered/pizza_party)
 "y" = (

_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -62,7 +62,7 @@
 /area/ruin/powered/seedvault)
 "ed" = (
 /obj/structure/closet/crate/freezer,
-/obj/effect/spawner/lootdrop/seed_vault,
+/obj/effect/spawner/random/seed_vault,
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "eI" = (