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.
Merge remote-tracking branch 'origin/master' into fax-tricks-revert-fix
- Loading branch information
Showing
1,635 changed files
with
97,561 additions
and
124,614 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
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
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,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 |
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 |
---|---|---|
|
@@ -6,44 +6,45 @@ | |
name: 'Render Nanomaps' | ||
on: | ||
schedule: | ||
- cron: "0 0 * * *" | ||
- cron: '0 0 * * *' | ||
workflow_dispatch: | ||
|
||
jobs: | ||
generate_maps: | ||
name: 'Generate NanoMaps' | ||
runs-on: ubuntu-22.04 | ||
steps: | ||
- id: create_token | ||
uses: actions/create-github-app-token@v1 | ||
with: | ||
app-id: ${{ secrets.APP_ID }} | ||
private-key: ${{ secrets.PRIVATE_KEY }} | ||
- 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 "GH_TOKEN=${{ steps.create_token.outputs.token }}" >> "$GITHUB_ENV" | ||
|
||
- name: 'Update Branch' | ||
uses: actions/checkout@v4 | ||
with: | ||
token: ${{ steps.create_token.outputs.token }} | ||
- name: 'Update Branch' | ||
uses: actions/checkout@v4 | ||
with: | ||
token: ${{ steps.create_token.outputs.token }} | ||
|
||
- name: Branch | ||
run: | | ||
git branch -f nanomap-render | ||
git checkout nanomap-render | ||
git reset --hard origin/master | ||
- name: Branch | ||
run: | | ||
git branch -f nanomap-render | ||
git checkout nanomap-render | ||
git reset --hard origin/master | ||
- name: 'Generate Maps' | ||
run: './tools/github-actions/nanomap-renderer-invoker.sh' | ||
- name: 'Generate Maps' | ||
run: './tools/github-actions/nanomap-renderer-invoker.sh' | ||
|
||
- name: 'Commit Maps and open PR' | ||
run: | | ||
git config --local user.email "[email protected]" | ||
git config --local user.name "NanoMap Generation" | ||
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,:scroll: CL не требуется" -H "nanomap-render" -B "master") | ||
if echo "$result" | grep -q "No commits between master and nanomap-render" | ||
echo "No NanoMaps update required, skipping." | ||
exit 78 | ||
- name: 'Commit Maps and open PR' | ||
run: | | ||
git config --local user.email "[email protected]" | ||
git config --local user.name "NanoMap Generation" | ||
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,: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." | ||
fi |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# Updates the DB from 60 to 61 ~Qwertytoforty | ||
# Makes a table for map picks | ||
|
||
# Adds the table for it. | ||
ALTER TABLE `player` | ||
ADD COLUMN `map_vote_pref_json` MEDIUMTEXT NULL DEFAULT NULL AFTER `viewrange`; |
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,4 @@ | ||
# Updating the SQL from version 61 to version 12. -AffectedArc07 | ||
# Adds a new bitflag column for toggles | ||
|
||
ALTER TABLE `player` ADD COLUMN `toggles_3` INT NULL DEFAULT NULL AFTER `toggles_2`; |
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,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`; |
46 changes: 0 additions & 46 deletions
46
_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_1.dmm
This file was deleted.
Oops, something went wrong.
46 changes: 0 additions & 46 deletions
46
_maps/map_files/RandomRuins/LavaRuins/chasm_bridges/lavaland_bridge_horizontal_2.dmm
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.