forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Конфликтов не было, кроме ТГУИ ## Changelog :cl: ParadiseSS13 add: Добавлено 2 новых бинда для смены рук, сменить/активировать (Левая/Правая) рука add: Добавлен публичный режим для голопадов. Включается мультитулом add: P.A.N.D.E.M.I.C. получил TGUI add: Добавлен кебаб из синт-плоти add: Добавлена не заменяющая голос хамелеон-маска tweak: Обычная хамелеон маска больше не в хамелеон ките, это не касается нюки tweak: Уменьшена цена Chameleon Modulator с 8 до 5 тк tweak: Вы больше ничего не видите если спите, вообще ничего! tweak: Сообщения суперматерии теперь более заметные tweak: Осмотр Vetus Speculator, теперь показывает какого типа ядро tweak: Дополнительные цели теперь принимают реагенты, в бочках тоже tweak: Конвертация в культ, теперь убирает всю святую воду из организма tweak: Кислотные банановые кожурки, больше не помещаются в мусорный пакет или мешок для растений imageadd: Новые спрайты для бюрократических приблуд imageadd: Респрайт Stock Parts, спрайты не с ТГ imageadd: Респрайт денег experiment: Добавлен эффект частиц от пули, в место куда она прилетает fix: Сингулярность больше не должна покидать зону содержания fix: Ментор ЛС снова отображаются в менторской вкладке fix: Дополнительные цели больше не будут существовать, если были принудительно выполнены, или удалены администратором /:cl:
- Loading branch information
Showing
142 changed files
with
2,217 additions
and
1,060 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
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 |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| name: Build MILLA | ||
| on: | ||
| issue_comment: | ||
| types: created | ||
|
|
||
| jobs: | ||
| build-milla: | ||
| if: | | ||
| github.event.issue.pull_request && | ||
| (github.event.comment.body == '!build_milla') && | ||
| ((github.event.sender.id == github.event.issue.user.id) || | ||
| (github.event.comment.author_association == 'COLLABORATOR') || | ||
| (github.event.comment.author_association == 'MEMBER') || | ||
| (github.event.comment.author_association == 'OWNER')) | ||
| 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" | ||
| - run: echo "FAIL_NOTIFIED=false" >> "$GITHUB_ENV" | ||
|
|
||
| - name: Like the comment | ||
| env: | ||
| BASE_REPOSITORY: ${{ github.repository }} | ||
| run: | | ||
| gh api \ | ||
| --method POST \ | ||
| -H "Accept: application/vnd.github+json" \ | ||
| -H "X-GitHub-Api-Version: 2022-11-28" \ | ||
| /repos/$BASE_REPOSITORY/issues/comments/${{ github.event.comment.id }}/reactions \ | ||
| -f content='+1' | ||
| - name: PR Data | ||
| run: | | ||
| pr_json=$(curl -L -s --fail-with-body -H "Authorization: token ${{ github.token }}" ${{ github.event.issue.pull_request.url }}) | ||
| if [ `jq -r '.maintainer_can_modify' <<<$pr_json` == "false" ] ; then | ||
| gh pr comment ${{ github.event.issue.html_url }} --body 'GitHub Actions can not push to the repository without "Allow edits and access to secrets by maintainers" checked.' | ||
| echo "FAIL_NOTIFIED=true" >> "$GITHUB_ENV" | ||
| exit 1 | ||
| fi | ||
| echo "PR_REPO=`jq -r '.head.repo.full_name' <<<$pr_json`" >> $GITHUB_ENV | ||
| echo "PR_BRANCH=`jq -r '.head.ref' <<<$pr_json`" >> $GITHUB_ENV | ||
| echo "PR_HEAD_LABEL=`jq -r '.head.label' <<<$pr_json`" >> $GITHUB_ENV | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| repository: ${{ env.PR_REPO }} | ||
| ref: ${{ env.PR_BRANCH }} | ||
| token: ${{ env.GH_TOKEN }} | ||
|
|
||
| - name: Build MILLA | ||
| env: | ||
| BASE_BRANCH: ${{ github.event.repository.default_branch }} | ||
| BASE_REPOSITORY: ${{ github.repository }} | ||
| GH_TOKEN: ${{ env.GH_TOKEN }} | ||
| run: | | ||
| # Get the code. | ||
| git config user.name paradisess13[bot] | ||
| git config user.email "165046124+paradisess13[bot]@users.noreply.github.com" | ||
| git pull origin "$PR_BRANCH" --depth=$((ahead_by + 1)) | ||
| git remote add upstream "https://github.com/$BASE_REPOSITORY.git" | ||
| git fetch upstream "$BASE_BRANCH" --depth=$((behind_by + 1)) | ||
| cd milla | ||
| # Get dependencies. | ||
| rustup target add i686-unknown-linux-gnu | ||
| 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 | ||
| # Build it. | ||
| cargo build --release --target i686-unknown-linux-gnu | ||
| cargo build --release --target i686-pc-windows-gnu | ||
| # Copy the built targets to their checked-in locations. | ||
| cp target/i686-unknown-linux-gnu/release/libmilla.so ../tools/ci/libmilla_ci.so | ||
| cp target/i686-pc-windows-gnu/release/milla.dll ../milla.dll | ||
| git commit -a -m "Build MILLA" --allow-empty | ||
| git push origin | ||
| - name: Notify Failure | ||
| if: failure() && env.FAIL_NOTIFIED != 'true' | ||
| run: | | ||
| gh pr comment ${{ github.event.issue.html_url }} -b 'Building MILLA failed, see the action run log for details: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}' |
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
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
Oops, something went wrong.