Merge branch 'master' into italian_moustache

.github/workflows/auto_translate.yml

@@ -0,0 +1,57 @@
+name: Add new translation
+
+on:
+  workflow_dispatch:
+  push:
+    branches: ['translate']
+
+jobs:
+  add_translation:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    name: 'Add new translation'
+
+    steps:
+      - name: 'Update Branch'
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Installing Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Installing deps
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r ./tools/translator/requirements.txt
+
+      - name: Create temporary branch
+        run: |
+          git checkout -b translate_tmp
+          git reset --hard origin/master
+      - name: Apply existing translation
+        run: |
+          git fetch origin translate
+          git checkout origin/translate -- ./tools/translator/ss220replace.json
+          ./tools/translator/ss220_replacer_linux --prefix=ss220 --root=./../../ --location=./
+
+      - name: Apply PR translation
+        run: |
+          git cherry-pick -n origin/translate
+
+      - name: 'Generate Translation'
+        run: |
+          python ./tools/translator/converter.py
+          [ ! -f ./ss220replace.json ] || mv ./ss220replace.json ./tools/translator/ss220replace.json
+          git add ./tools/translator/ss220replace.json
+
+      - name: 'Push Translation'
+        run: |
+          git config --local user.email "[email protected]"
+          git config --local user.name "SS220Manager"
+          git commit -m "Generate translation file"
+          git push -f origin translate_tmp:translate

.github/workflows/translate_branch_update.yml

@@ -0,0 +1,36 @@
+name: Update translate branch
+
+on:
+  workflow_dispatch:
+  push:
+    branches: ['master']
+
+jobs:
+  add_translation:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+    - name: 'Update Branch'
+      uses: actions/checkout@v4
+
+    - name: Create temporary branch
+      run: |
+        git branch -f translate_tmp
+        git checkout translate_tmp
+        git reset --hard origin/master
+
+    - name: Apply existing translation
+      run: |
+        git fetch origin translate
+        git checkout origin/translate -- ./tools/translator/ss220replace.json
+        ./tools/translator/ss220_replacer_linux --prefix=ss220 --root=./../../ --location=./
+
+    - name: 'Push Translation'
+      run: |
+        git config --local user.email "[email protected]"
+        git config --local user.name "SS220Manager"
+        git commit -m "Generate translation file"
+        git push -u -f origin translate

_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm

@@ -1445,9 +1445,7 @@
 /obj/effect/spawner/random_spawners/blood_often,
 /obj/effect/spawner/random_spawners/dirt_often,
 /obj/item/organ/external/hand,
-/obj/machinery/power/apc/off_station/empty_charge{
-	pixel_x = -24
-	},
+/obj/machinery/power/apc/off_station/empty_charge/west,
 /turf/simulated/floor/mineral/plastitanium,
 /area/ruin/space/powered/requires_power_space)
 "Ok" = (