Merge branch 'master' into Antag_mix_blacklist

ss220club · Dec 26, 2024 · 313c514 · 313c514
2 parents 2bdb320 + 7a4f324
commit 313c514
Show file tree

Hide file tree

Showing 363 changed files with 4,586 additions and 2,382 deletions.
diff --git a/.github/workflows/build_rust.yml b/.github/workflows/build_rust.yml
@@ -72,7 +72,7 @@ jobs:
           rustup target add i686-pc-windows-gnu
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install zlib1g-dev:i386 lib32gcc-11-dev mingw-w64 mingw-w64-i686-dev
+          sudo apt-get install zlib1g-dev:i386 lib32gcc-13-dev mingw-w64 mingw-w64-i686-dev
 
           # Build it.
           cargo build --release --target i686-unknown-linux-gnu

diff --git a/.github/workflows/check_changelog.yml b/.github/workflows/check_changelog.yml
@@ -15,20 +15,31 @@ jobs:
     if: github.base_ref == 'master' && github.event.pull_request.draft == false
 
     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: Downloading scripts
         run: |
           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:
           python-version: '3.x'
+
       - name: Installing deps
         run: |
           python -m pip install --upgrade pip
           pip install ruamel.yaml PyGithub
+
       - name: Changelog validation
         env:
-          GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+          GITHUB_TOKEN: ${{ env.GH_TOKEN }}
         run: python check_changelog.py
diff --git a/.github/workflows/master_ancestor.yml b/.github/workflows/master_ancestor.yml
@@ -0,0 +1,30 @@
+name: Check Master Merged
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  check-master-merged:
+    runs-on: ubuntu-latest
+    if: github.head_ref == 'merge-upstream'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.base_ref }}
+
+      - name: Fetch head branch
+        run: git fetch origin ${{ github.head_ref }}
+
+      - name: Check if master is merged
+        run: |
+          git checkout ${{ github.head_ref }}
+          if git merge-base --is-ancestor origin/${{ github.base_ref }} HEAD; then
+            exit 0
+          else
+            echo "Base branch is NOT merged into the head branch. Merge base branch to keep CI checks relevant."
+            exit 1
+          fi
diff --git a/.github/workflows/merge_upstream.yml b/.github/workflows/merge_upstream.yml
@@ -24,12 +24,13 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install PyGithub googletrans==4.0.0-rc1
+          pip install PyGithub openai
 
       - 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
+          wget https://raw.githubusercontent.com/${{ github.repository }}/${{ github.ref_name }}/tools/merge-upstream/translation_context.txt
 
       - name: Run the script
         env:
@@ -39,9 +40,11 @@ jobs:
           UPSTREAM_REPO: 'ParadiseSS13/Paradise'
           UPSTREAM_BRANCH: 'master'
           MERGE_BRANCH: 'merge-upstream'
-          TRANSLATE_CHANGES: 'true'
           CHANGELOG_AUTHOR: 'ParadiseSS13'
+          TRANSLATE_CHANGES: 'true'
+          OPENAI_API_KEY: ${{ secrets.ORG_EMPTY_TOKEN }}
+          LOG_LEVEL: ${{ runner.debug && 'DEBUG' || 'INFO' }}
         run: |
           git config --global user.email "action@github.com"
           git config --global user.name "Upstream Sync"
-          python3 merge_upstream.py
+          python3 -u merge_upstream.py
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm b/_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
@@ -19,11 +19,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/delta)
 "af" = (
-/obj/machinery/porta_turret{
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/delta)
 "ag" = (
@@ -1827,12 +1823,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/unpowered/bmp_ship/aft)
 "go" = (
-/obj/machinery/porta_turret{
-	check_synth = 1;
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/fore)
 "gp" = (
@@ -2118,12 +2109,7 @@
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/aft)
 "hp" = (
-/obj/machinery/porta_turret{
-	check_synth = 1;
-	installation = /obj/item/gun/energy/gun;
-	lethal = 1;
-	name = "ship defense turret"
-	},
+/obj/machinery/porta_turret/meatpacker_ship,
 /turf/simulated/floor/engine,
 /area/ruin/unpowered/bmp_ship/aft)
 "hq" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
@@ -323,7 +323,7 @@
 /area/ruin/space/powered/bar)
 "bn" = (
 /obj/effect/mapping_helpers/turfs/damage,
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/bar)
 "bo" = (
@@ -484,7 +484,7 @@
 /turf/simulated/floor/plating/asteroid/ancient,
 /area/space/nearstation)
 "pb" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/machinery/door_control{
 	id = "SpaceBar";
 	name = "Public Shutters";
@@ -895,7 +895,7 @@
 /area/ruin/space/powered)
 "QU" = (
 /obj/effect/mapping_helpers/turfs/damage,
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -949,7 +949,7 @@
 	},
 /area/ruin/space/powered/bar)
 "VR" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/bar)
 "VU" = (

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -3173,7 +3173,7 @@
 	},
 /area/ruin/space/derelict/crew_quarters)
 "iq" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/template_noop,
 /area/space/nearstation)
 "ir" = (
@@ -5147,7 +5147,7 @@
 	},
 /area/ruin/space/derelict/arrival)
 "nM" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/derelict/hallway/primary)
 "nN" = (
@@ -5344,7 +5344,7 @@
 	},
 /area/ruin/space/derelict/crew_quarters)
 "on" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/template_noop,
 /area/ruin/space/derelict/arrival)
 "op" = (

diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -51723,7 +51723,7 @@
 /turf/simulated/floor/carpet/arcade,
 /area/station/public/arcade)
 "fmT" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 4
@@ -87313,7 +87313,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/hallway/primary/starboard/east)
 "xWz" = (
-/obj/item/stack/tile/mineral,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9

diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
@@ -72250,7 +72250,7 @@
 	},
 /obj/machinery/power/apc/directional/west,
 /obj/machinery/camera{
-	c_tag = "Atsmospherics Hardsuit Storage West";
+	c_tag = "Atmospherics Hardsuit Storage West";
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -89371,7 +89371,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan,
 /obj/machinery/alarm/directional/north,
 /obj/machinery/camera{
-	c_tag = "Atsmospherics Hardsuit Storage North East"
+	c_tag = "Atmospherics Hardsuit Storage North East"
 	},
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -92362,7 +92362,7 @@
 /area/station/hallway/primary/starboard)
 "sjz" = (
 /obj/machinery/camera{
-	c_tag = "AI Satellite ExteriorEast";
+	c_tag = "AI Satellite Exterior East";
 	dir = 4;
 	network = list("SS13","MiniSat")
 	},
@@ -113546,7 +113546,7 @@
 /obj/item/stack/cable_coil,
 /obj/item/t_scanner,
 /obj/machinery/camera{
-	c_tag = "Atsmospherics Control ROom";
+	c_tag = "Atmospherics Control Room";
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{

diff --git a/_maps/map_files220/RandomRuins/LavaRuins/old_outpost.dmm b/_maps/map_files220/RandomRuins/LavaRuins/old_outpost.dmm
@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aD" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /obj/structure/table_frame,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating/lavaland_air,
@@ -498,7 +498,7 @@
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "zW" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "Ab" = (
@@ -605,7 +605,7 @@
 	},
 /area/ruin/unpowered/misc_lavaruin)
 "HE" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plasteel/lavaland_air{
 	icon_state = "blue";
@@ -847,7 +847,7 @@
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "TL" = (
-/obj/item/stack/tile,
+/obj/item/stack/tile/plasteel,
 /turf/simulated/floor/plasteel/lavaland_air,
 /area/ruin/unpowered/misc_lavaruin)
 "TW" = (