forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into brainrot-filter
- Loading branch information
Showing
1,521 changed files
with
50,901 additions
and
35,943 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
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,39 +1,82 @@ | ||
| 'TGUI': | ||
| - 'tgui/**' | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['tgui/**'] | ||
|
|
||
| 'Звук': | ||
| - '**/*.ogg' | ||
| ':sound: Звук': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['**/*.ogg'] | ||
|
|
||
| 'Изменение Карты': | ||
| - '**/*.dmm' | ||
| ':world_map: Изменение Карты': | ||
| - all: | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['**/*.dmm'] | ||
| - all-globs-to-all-files: ['!_maps/map_files220/stations/*.dmm'] | ||
|
|
||
| 'Инструменты': | ||
| - '.gihub/workflows/**' | ||
| - 'tools/**' | ||
| 'Кибериада': | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['_maps/map_files220/stations/boxstation.dmm'] | ||
|
|
||
| 'Керберос': | ||
| - '_maps/map_files220/stations/deltastation.dmm' | ||
|
|
||
| 'Кибериада': | ||
| - '_maps/map_files220/stations/boxstation.dmm' | ||
| - changed-files: | ||
| - any-glob-to-any-file: ['_maps/map_files220/stations/deltastation.dmm'] | ||
|
|
||
| 'Цереброн': | ||
| - '_maps/map_files220/stations/metastation.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: ['.gihub/**', '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' | ||
|
|
||
| 'НЕ МОДУЛЬНО': | ||
| - all: ['code/**'] | ||
| ':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' | ||
|
|
||
| 'Спрайты': | ||
| - '**/*.dmi' | ||
| ':pray: Слияние с восходящим потоком': | ||
| - all: | ||
| - base-branch: 'master' | ||
| - head-branch: 'merge-upstream' | ||
|
|
||
| 'Требуется изменение конфига': | ||
| - 'config/**' | ||
| ':pencil: Перевод': | ||
| - base-branch: 'translate' | ||
|
|
||
| 'Документация': | ||
| - '**/*.md' | ||
| ':wrench: Фикс': | ||
| - head-branch: ['^fix', 'fix'] | ||
|
|
||
| 'Частичная модульность': | ||
| - all: ['code/**', modular_ss220/**] | ||
| ':trollface: Фича': | ||
| - head-branch: ['^feat', 'feat'] | ||
|
|
||
| 'SQL': | ||
| - 'SQL/**' | ||
| ':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
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,49 @@ | ||
| name: 'PR Wiki Label' | ||
| on: | ||
| issue_comment: | ||
| types: [created] | ||
|
|
||
| jobs: | ||
| wiki-label: | ||
| runs-on: ubuntu-latest | ||
| if: github.event.issue.pull_request && github.event.comment.body == '!wiki_label' | ||
| permissions: | ||
| issues: write | ||
| pull-requests: write | ||
| steps: | ||
| - name: Check commenter authorization | ||
| id: check-auth | ||
| run: | | ||
| IFS=',' read -ra WIKI_MANAGERS <<< "${{ vars.WIKI_MANAGERS }}" | ||
| COMMENTER_ID="${{ github.event.comment.user.id }}" | ||
| if [[ " ${WIKI_MANAGERS[@]} " =~ " ${COMMENTER_ID} " ]]; then | ||
| echo "authorized=true" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "authorized=false" >> $GITHUB_OUTPUT | ||
| fi | ||
| - name: Add thumbs up reaction and Wiki label | ||
| if: steps.check-auth.outputs.authorized == 'true' | ||
| run: | | ||
| # Add thumbs up reaction | ||
| curl -X POST \ | ||
| -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ | ||
| -H "Accept: application/vnd.github.v3+json" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/comments/${{ github.event.comment.id }}/reactions" \ | ||
| -d '{"content":"+1"}' | ||
| # Add label to PR | ||
| curl -X POST \ | ||
| -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ | ||
| -H "Accept: application/vnd.github.v3+json" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels" \ | ||
| -d '["Requires Wiki Update"]' | ||
| - name: Unauthorized user thumbs down reaction | ||
| if: steps.check-auth.outputs.authorized == 'false' | ||
| run: | | ||
| curl -X POST \ | ||
| -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ | ||
| -H "Accept: application/vnd.github.v3+json" \ | ||
| "https://api.github.com/repos/${{ github.repository }}/issues/comments/${{ github.event.comment.id }}/reactions" \ | ||
| -d '{"content":"-1"}' |
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,18 +1,26 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| { | ||
| "type": "byond", | ||
| "request": "launch", | ||
| "name": "Build & DS Debug", | ||
| "preLaunchTask": "dm: build - ${command:CurrentDME}", | ||
| "dmb": "${workspaceFolder}/${command:CurrentDMB}" | ||
| }, | ||
| { | ||
| }, | ||
| { | ||
| "type": "byond", | ||
| "request": "launch", | ||
| "name": "Build & DD Debug", | ||
| "preLaunchTask": "dm: build - ${command:CurrentDME}", | ||
| "dmb": "${workspaceFolder}/${command:CurrentDMB}", | ||
| "dreamDaemon": true | ||
| }, | ||
| { | ||
| "type": "byond", | ||
| "request": "launch", | ||
| "name": "DS Debug", | ||
| "dmb": "${workspaceFolder}/${command:CurrentDMB}" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |
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,17 @@ | ||
| # Updating DB from 57-58 ~Burza | ||
| # Changes the data type for the `ip` column in `connection_log` from VARCHAR to INT | ||
|
|
||
| # Creates a temporary column for our new data type | ||
| ALTER TABLE `connection_log` | ||
| ADD COLUMN `ip_int` INT UNSIGNED NULL; | ||
|
|
||
| # Copies the data from the `ip` column to `ip_int` as our new data type | ||
| UPDATE `connection_log` | ||
| SET `ip_int` = INET_ATON(`ip`); | ||
|
|
||
| # Deletes the old `ip` column from the table | ||
| ALTER TABLE `connection_log` DROP COLUMN `ip`; | ||
|
|
||
| # Updates the name of the temporary column to take place of the original | ||
| ALTER TABLE `connection_log` | ||
| CHANGE COLUMN `ip_int` `ip` INT UNSIGNED NOT NULL AFTER `ckey`; |
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.