forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into merge-upstream
- Loading branch information
Showing
1,965 changed files
with
1,320,478 additions
and
14,395 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| #DOCS | ||
| #https://docs.github.com/en/github-ae@latest/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser | ||
| # | ||
| blank_issues_enabled: false | ||
| blank_issues_enabled: true | ||
| contact_links: | ||
| - name: Feature Request | ||
| url: https://www.paradisestation.org/forum/60-suggestions/ | ||
| about: Please place all feature requests at the following link. (Paradise Station Forums) | ||
| url: https://discord.com/channels/1097181193939730453/1181261198096875670 | ||
| about: Запросы новых фич следует оставлять на форуме ss13-трекер в дискорде. | ||
| - name: Exploit Reports | ||
| url: https://www.paradisestation.org/forum/179-exploit-reports/ | ||
| about: If your issue is an ingame exploit that allows players to gain an unfair advantage, or an issue which could affect server stability or security, please file it here so that it is safe from prying eyes. (Paradise Station Forums) | ||
| url: https://github.com/ss220club/Paradise-SS220/security | ||
| about: Критические баги, которые могут быть использованы со злыми намерениями, следует оставлять по ссылке. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,40 @@ | ||
| <!-- By ticking or leaving ticked the option "Allow edits and access to secrets by maintainers" you give permission for repository maintainers to push changes to your branch without explicitly asking. --> | ||
| <!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> | ||
| <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> | ||
|
|
||
| <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> | ||
| <!-- You can view Contributing.MD for a detailed description of the pull request process. --> | ||
| ## Что этот PR делает | ||
|
|
||
| ## What Does This PR Do | ||
| <!-- Вкратце опишите изменения, которые вносите. --> | ||
| <!-- Опишите **все** изменения, так как противное может сказаться на рассмотрении этого PR'а! --> | ||
| <!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после принятия PR'а. --> | ||
|
|
||
| <!-- Include a small to medium description of what your PR changes. --> | ||
| <!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! --> | ||
| <!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. --> | ||
| ## Почему это хорошо для игры | ||
|
|
||
| ## Why It's Good For The Game | ||
| <!-- Опишите, почему, по вашему, следует добавить эти изменения в игру. --> | ||
|
|
||
| <!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> | ||
| ## Изображения изменений | ||
|
|
||
| ## Images of changes | ||
| <!-- Если вы не меняли карту или спрайты, можете опустить эту секцию. Если хотите, можете вставить видео. --> | ||
|
|
||
| <!-- If you did not make a map or sprite edit, you may delete this section. You may include a gif or mp4 of your feature if you want. --> | ||
| ## Тестирование | ||
|
|
||
| ## Testing | ||
|
|
||
| <!-- How did you test the PR, if at all? --> | ||
|
|
||
| <hr> | ||
|
|
||
| ### Declaration | ||
|
|
||
| - [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below. | ||
| <!-- Replace the box with [x] to mark as complete. --> | ||
| <!-- Ensure there are no spaces between the x and the square brackets [] else this will not work properly. --> | ||
| <hr> | ||
| <!-- Как вы тестировали свой PR, если делали это вовсе? --> | ||
|
|
||
| ## Changelog | ||
|
|
||
| :cl: | ||
| add: Added new things | ||
| del: Removed old things | ||
| tweak: Tweaked a few things | ||
| fix: Fixed a few things | ||
| wip: Added a few works in progress | ||
| soundadd: Added a new sound thingy | ||
| sounddel: Removed an old sound thingy | ||
| imageadd: Added some icons and images | ||
| imagedel: Deleted some icons and images | ||
| spellcheck: Fixed a few typos | ||
| experiment: Added an experimental thingy | ||
| add: Что-то добавил | ||
| del: Что-то удалил | ||
| tweak: Поменял что-то по мелочи | ||
| fix: Что-то починил | ||
| wip: Какие-либо наработки в процессе | ||
| soundadd: Добавил новый звук | ||
| sounddel: Удалил старый звук | ||
| imageadd: Добавил новую картинку | ||
| imagedel: Удалил старую картинку | ||
| spellcheck: Исправил опечатку | ||
| experiment: Добавил экспериментальную функцию | ||
| /:cl: | ||
|
|
||
| <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> | ||
| <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> | ||
| <!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. --> | ||
| <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> | ||
| <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> | ||
| <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. --> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| 'TGUI': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['tgui/**'] | ||
|
|
||
| ':sound: Звук': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['**/*.ogg'] | ||
|
|
||
| ':world_map: Изменение Карты': | ||
| - all: | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['**/*.dmm'] | ||
| - all-globs-to-all-files: ['!_maps/map_files220/stations/*.dmm'] | ||
|
|
||
| 'Кибериада': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['_maps/map_files220/stations/boxstation.dmm'] | ||
|
|
||
| 'Керберос': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['_maps/map_files220/stations/deltastation.dmm'] | ||
|
|
||
| 'Цереброн': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['_maps/map_files220/stations/metastation.dmm'] | ||
|
|
||
| 'Фаррагус': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['_maps/map_files220/stations/cerestation.dmm'] | ||
|
|
||
| ':paintbrush: Спрайты': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['**/*.dmi'] | ||
|
|
||
| ':guitar: Инструменты': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['.github/**', 'tools/**', '.vscode/**', '.bin/**'] | ||
|
|
||
| ':floppy_disk: Изменение конфига': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['config/**'] | ||
|
|
||
| ':neckbeard: Документация': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['**/*.md'] | ||
|
|
||
| ':cd: SQL': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['SQL/**'] | ||
|
|
||
| ':feelsgood: Частичная модульность': | ||
| - all: | ||
| - changed-files: | ||
| - 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$).*' | ||
|
|
||
| ':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$).*' | ||
|
|
||
| ':pray: Слияние с восходящим потоком': | ||
| - all: | ||
| - base-branch: 'master' | ||
| - head-branch: 'merge[-_]upstream' | ||
|
|
||
| ':pencil: Перевод': | ||
| - base-branch: 'translate' | ||
|
|
||
| ':wrench: Фикс': | ||
| - head-branch: ['^fix', 'fix'] | ||
|
|
||
| ':trollface: Фича': | ||
| - head-branch: ['^feat', 'feat'] | ||
|
|
||
| ':shipit: Улучшение': | ||
| - head-branch: ['^tweak', 'tweak'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| name: Add new translation | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| branches: ['translate'] | ||
|
|
||
| concurrency: | ||
| group: translation | ||
| cancel-in-progress: false | ||
|
|
||
| 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: Git fetch | ||
| run: | | ||
| git fetch | ||
| - name: Create temporary branch | ||
| run: | | ||
| git checkout -b translate_tmp ${{ github.sha }}^ | ||
| - name: Apply PR translation | ||
| run: | | ||
| git diff ${{ github.sha }}^..${{ github.sha }} | git apply | ||
| - name: 'Generate Translation' | ||
| run: | | ||
| python ./tools/translator/converter.py | ||
| git add ./tools/translator/ss220replace.json | ||
| git checkout -- . | ||
| - name: 'Push Translation' | ||
| run: | | ||
| git fetch origin translate | ||
| git checkout origin/translate | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "ss220bot" | ||
| git commit -m "Generate translation file" | ||
| git push origin translate:translate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| name: Changelog validation | ||
|
|
||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
| issues: write | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| types: [opened, reopened, edited, labeled, unlabeled, ready_for_review] | ||
|
|
||
| jobs: | ||
| CheckCL: | ||
| runs-on: ubuntu-latest | ||
| if: github.base_ref == 'master' && github.event.pull_request.draft == false | ||
|
|
||
| steps: | ||
| - 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 }} | ||
| run: python check_changelog.py |
Oops, something went wrong.