-
Notifications
You must be signed in to change notification settings - Fork 93
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 changelings-nerf2
- Loading branch information
Showing
3,677 changed files
with
1,659,247 additions
and
158,777 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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,7 +1,7 @@ | ||
contact_links: | ||
- name: Report a Security Vulnerability | ||
url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md | ||
about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed. | ||
- name: Request a Feature | ||
url: https://discord.gg/rGvu9hKffJ | ||
about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ). | ||
#contact_links: | ||
# - name: Report a Security Vulnerability | ||
# url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md | ||
# about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed. | ||
# - name: Request a Feature | ||
# url: https://discord.gg/rGvu9hKffJ | ||
# about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ). |
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,20 +1,20 @@ | ||
--- | ||
name: Report an Issue | ||
about: "..." | ||
name: Сообщить о проблеме | ||
about: "Сообщить о баге, недоработке разработчикам для решения проблемы." | ||
title: '' | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
## Description | ||
<!-- Explain your issue in detail. Issues without proper explanation are liable to be closed by maintainers. --> | ||
## Описание | ||
<!-- Подробно объясните вашу проблему. Проблемы без должного объяснения могут быть закрыты поддерживающими проект. --> | ||
|
||
**Reproduction** | ||
<!-- Include the steps to reproduce if applicable. --> | ||
**Воспроизведение** | ||
<!-- Включите шаги для воспроизведения, если это возможно. --> | ||
|
||
**Screenshots** | ||
<!-- If applicable, add screenshots to help explain your problem. --> | ||
**Медиа** | ||
<!-- Если есть возможность, прикрепите скриншот/видео, показывающие саму проблему и шаги ее воспроизведения. --> | ||
|
||
**Additional context** | ||
<!-- Add any other context about the problem here. Anything you think is related to the issue. --> | ||
**Дополнительный контекст** | ||
<!-- Добавьте сюда любой другой контекст или скриншоты, связанные с проблемой. --> |
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,17 @@ | ||
--- | ||
name: Toolshed feature request | ||
about: Suggest a feature for Toolshed (for game admins/developers) | ||
title: "[TOOLSHED REQUEST]" | ||
labels: Toolshed | ||
assignees: moonheart08 | ||
name: Предложить новое | ||
about: Запросить у разработчиков добавить что-то новое. | ||
title: "[Предложение]" | ||
labels: "На рассмотрении" | ||
assignees: VigersRay | ||
|
||
--- | ||
|
||
**Is your feature request related to a problem/bug? Please describe.** | ||
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] | ||
**Ваш запрос функции связан с проблемой/ошибкой? Опишите, пожалуйста.** | ||
<!-- Четкое и краткое описание проблемы. Например: Меня всегда раздражает, когда [...] --> | ||
|
||
**Describe the command you'd like** | ||
A clear and concise description of what you want and what it should do. | ||
If you're a technical user (i.e. programmer) including type signatures is helpful. | ||
**Опишите желаемое** | ||
<!-- Четкое и краткое описание того, что вы хотите, и что оно должно делать. --> | ||
|
||
**Additional context** | ||
Add any other context or screenshots about the feature request here. | ||
**Дополнительный контекст** | ||
<!-- Добавьте сюда любой другой контекст или скриншоты, связанные с запросом функции. --> |
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,9 +1,9 @@ | ||
Project-Condor: | ||
org: space-wizards | ||
org: space-sunrise | ||
project: 2 | ||
inbox: Inbox | ||
labels: | ||
"W: In Progress": "In Progress" | ||
"W: In Progress": "В Прогрессе" | ||
"W: Discussion": "Design and Discussion" | ||
"W: Backlog": "Backlog" | ||
"W: Next": "Next" | ||
"W: Next": "Следующее" |
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,22 +1,26 @@ | ||
"Changes: Sprites": | ||
"Изменения: Спрайты": | ||
- changed-files: | ||
- any-glob-to-any-file: '**/*.rsi/*.png' | ||
|
||
"Changes: Map": | ||
"Изменения: Карты": | ||
- changed-files: | ||
- any-glob-to-any-file: | ||
- 'Resources/Maps/**/*.yml' | ||
- 'Resources/Prototypes/Maps/**/*.yml' | ||
|
||
"Changes: UI": | ||
"Изменения: Интерфейс": | ||
- changed-files: | ||
- any-glob-to-any-file: '**/*.xaml*' | ||
|
||
"Changes: Shaders": | ||
"Изменения: Шейдеры": | ||
- changed-files: | ||
- any-glob-to-any-file: '**/*.swsl' | ||
|
||
"No C#": | ||
"Изменения: Локализация": | ||
- changed-files: | ||
- any-glob-to-any-file: '**/*.ftl' | ||
|
||
"Нет C#": | ||
- changed-files: | ||
# Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label. | ||
- all-globs-to-all-files: "!**/*.cs" |
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,62 +1,63 @@ | ||
name: Build & Test Debug | ||
|
||
on: | ||
push: | ||
branches: [ master, staging, trying ] | ||
merge_group: | ||
pull_request: | ||
types: [ opened, reopened, synchronize, ready_for_review ] | ||
branches: [ master ] | ||
|
||
jobs: | ||
build: | ||
if: github.actor != 'GayBot' && github.event.pull_request.draft == false | ||
strategy: | ||
matrix: | ||
os: [ubuntu-latest] | ||
|
||
runs-on: ${{ matrix.os }} | ||
|
||
steps: | ||
- name: Checkout Master | ||
uses: actions/[email protected] | ||
|
||
- name: Setup Submodule | ||
run: | | ||
git submodule update --init --recursive | ||
- name: Pull engine updates | ||
uses: space-wizards/[email protected] | ||
|
||
- name: Update Engine Submodules | ||
run: | | ||
cd RobustToolbox/ | ||
git submodule update --init --recursive | ||
- name: Setup .NET Core | ||
uses: actions/[email protected] | ||
with: | ||
dotnet-version: 8.0.x | ||
|
||
- name: Install dependencies | ||
run: dotnet restore | ||
|
||
- name: Build Project | ||
run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m | ||
|
||
- name: Run Content.Tests | ||
run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0 | ||
|
||
- name: Run Content.IntegrationTests | ||
shell: pwsh | ||
run: | | ||
$env:DOTNET_gcServer=1 | ||
dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed | ||
ci-success: | ||
name: Build & Test Debug | ||
needs: | ||
- build | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: CI succeeded | ||
run: exit 0 | ||
# Sunrise-edit - no need, stupid test. | ||
#name: Build & Test Debug | ||
# | ||
#on: | ||
# push: | ||
# branches: [ master, staging, trying ] | ||
# merge_group: | ||
# pull_request: | ||
# types: [ opened, reopened, synchronize, ready_for_review ] | ||
# branches: [ master ] | ||
# | ||
#jobs: | ||
# build: | ||
# if: github.actor != 'GayBot' && github.event.pull_request.draft == false | ||
# strategy: | ||
# matrix: | ||
# os: [ubuntu-latest] | ||
# | ||
# runs-on: ${{ matrix.os }} | ||
# | ||
# steps: | ||
# - name: Checkout Master | ||
# uses: actions/[email protected] | ||
# | ||
# - name: Setup Submodule | ||
# run: | | ||
# git submodule update --init --recursive | ||
# | ||
# - name: Pull engine updates | ||
# uses: space-wizards/[email protected] | ||
# | ||
# - name: Update Engine Submodules | ||
# run: | | ||
# cd RobustToolbox/ | ||
# git submodule update --init --recursive | ||
# | ||
# - name: Setup .NET Core | ||
# uses: actions/[email protected] | ||
# with: | ||
# dotnet-version: 8.0.x | ||
# | ||
# - name: Install dependencies | ||
# run: dotnet restore | ||
# | ||
# - name: Build Project | ||
# run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m | ||
# | ||
# - name: Run Content.Tests | ||
# run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0 | ||
# | ||
# - name: Run Content.IntegrationTests | ||
# shell: pwsh | ||
# run: | | ||
# $env:DOTNET_gcServer=1 | ||
# dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed | ||
# ci-success: | ||
# name: Build & Test Debug | ||
# needs: | ||
# - build | ||
# runs-on: ubuntu-latest | ||
# steps: | ||
# - name: CI succeeded | ||
# run: exit 0 |
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,28 @@ | ||
name: Locale Validator | ||
|
||
on: | ||
push: | ||
branches: [ staging, trying ] | ||
pull_request: | ||
types: [opened, synchronize, reopened] | ||
paths: | ||
- '**.yml' | ||
- '**.ftl' | ||
|
||
jobs: | ||
validate_ymls: | ||
name: Validate Locales | ||
runs-on: ubuntu-latest | ||
if: github.event.pull_request.draft == false | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Set up Python | ||
uses: actions/setup-python@v4 | ||
with: | ||
python-version: '3.x' | ||
- name: Install dependencies | ||
run: | | ||
pip install --no-cache-dir PyYAML | ||
- name: Validate Locales | ||
run: | | ||
python3 Tools/_sunrise/Schemas/validate_yml.py Resources/Locale/ Resources/Prototypes/ --ignore Tools/_sunrise/Schemas/ignore_list.yml |
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 |
---|---|---|
|
@@ -14,9 +14,13 @@ jobs: | |
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/[email protected] | ||
- name: Set up Python | ||
uses: actions/setup-python@v4 | ||
with: | ||
python-version: '3.x' | ||
- name: Install Python dependencies | ||
run: | | ||
pip3 install --ignore-installed --user pillow jsonschema | ||
- name: Validate RSIs | ||
run: | | ||
python3 Tools/Schemas/validate_rsis.py Resources/ | ||
python3 Tools/Schemas/validate_rsis.py Resources/Prototypes/ |
Oops, something went wrong.