Upstream update

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 contact_links:
   - name: Report a Security Exploit
     url: https://discord.gg/MwDDf6t
-    about: Please report serious security exploits and vulnerabilities to @PJB3005. (PJB#3005/97089048065097728 on discord).
+    about: Please report serious security exploits and vulnerabilities to @PJB3005 (PJB#3005/97089048065097728 on Discord).
   - name: Request a Feature
     url: https://discord.gg/rGvu9hKffJ
-    about: Submit feature requests on our [discord server](https://discord.gg/rGvu9hKffJ).
+    about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).

.github/ISSUE_TEMPLATE/issue_report.md

@@ -1,20 +1,18 @@
 ---
-name: Report an Issue
+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. -->
+**Репродукция**
+<!-- Опишите шаги для репродукции (100% шанса получения проблемы), если применимо -->
 
-**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. -->
+**Дополнительный контекст**
+<!-- Добавьте сюда любой другой контекст о проблеме. Все, что, по вашему мнению, имеет отношение к проблеме. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,39 +1,35 @@
-<!-- The text between the arrows are comments - they will not be visible on your PR. -->
-<!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
+## О запросе слияния
+<!-- Что изменено? На какие вещи это может повлиять? -->
 
-## About the PR <!-- Describe the Pull Request here. What does it change? What other things could this impact? -->
 
-**Media**
+**Медиа**
 <!-- 
-If applicable, add screenshots or videos to showcase your PR. Small fixes/refactors are exempt, but all PRs which make ingame changes 
-(adding clothing, items, new features, etc) must include ingame media or the PR will not be merged, in accordance with our PR guidelines.
-This makes it much easier for us to merge PRs and find media for progress reports. If you include media in your pull request, we 
-may potentially use it in the SS14 progress reports, with clear credit given.
+Запросы слияния, которые вносят внутриигровые изменения (добавление одежды, предметов, новых возможностей и т.д.), должны содержать медиа, демонстрирующие изменения.
+Небольшие исправления/рефакторы не требуют медиа.
 
-Use screenshot software like Window's built in snipping tool, ShareX, Lightshot, or recording software like ShareX (gif), ScreenToGif, or Open Broadcaster Software (cross platform).
-If you're unsure whether your PR will require media, ask a maintainer.
+Если вы не уверены в том, что ваш запрос слияния требует медиа, спросите мейнтейнера.
 
-Check one of the boxes below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
+Отметьте поле ниже, чтобы подтвердить, что вы действительно видели это (поставьте X в скобках, например [X]):
 -->
 
-- [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase
+- [ ] Я добавил скриншоты/видео к этому запросу слияния, демонстрирующие его изменения в игре, **или** этот запрос слияния не требует демонстрации в игре
 
-**Changelog**
+**Чейнджлог**
 <!--
-Here you can fill out a changelog that will automatically be added to the game when your PR is merged
-There are 4 icons for changelog entries: add, remove, tweak, fix. I trust you can figure out the rest.
+Здесь вы можете заполнить журнал изменений, который будет автоматически добавлен в игру при слиянии вашего запроса на слияние.
 
-You can put your name after the :cl: symbol to change the name that shows in the changelog (otherwise it takes your GitHub username)
-Like so: :cl: PJB
+Вносите в журнал изменений только те изменения, которые заметны и важны для игрока.
 
-Generally, only put things in changelogs that players actually care about. Stuff like "Refactored X system, no changes should be visible" shouldn't be on a changelog.
+Не считайте суффикс типа записи (например, add) "частью" предложения:
+плохо: - add: новый инструмент для инженеров
+хорошо: - add: добавлен новый инструмент для инженеров
 
-For writing actual entries, don't consider the entry type suffix (e.g. add) to be "part" of the sentence:
-bad: - add: a new tool for engineers
-good: - add: added a new tool for engineers
+Помещение имени после символа :cl: изменит имя, которое будет отображаться в журнале изменений (в противном случае будет использоваться ваше имя пользователя GitHub).
+Например: :cl: AruMoon
 -->
 
 :cl:
-- add: Added fun!
-- remove: Removed fun!
-
+- add: Добавлено веселье!
+- remove: Удалено веселье!
+- tweak: Изменено веселье!
+- fix: Исправлено веселье!

.github/workflows/build-test-debug.yml

@@ -2,31 +2,15 @@ name: Build & Test Debug
 
 on:
   push:
-    branches: [ master, master-ru, arumoon-server ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      # no docs on which one of these is supposed to work, so
-      # why not just do both
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
+    branches: [ master, staging, trying, master-ru, arumoon-server ]
+  merge_group:
   pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master, master-ru, arumoon-server ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
@@ -68,3 +52,11 @@ jobs:
       run: |
         $env:DOTNET_gcServer=1
         dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+  ci-success:
+    name: Build & Test Debug
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0

.github/workflows/build-test-release.yml

@@ -2,31 +2,15 @@ name: Build & Test Release
 
 on:
   push:
-    branches: [ master, master-ru, arumoon-server ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      # no docs on which one of these is supposed to work, so
-      # why not just do both
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
+    branches: [ master, staging, trying, master-ru, arumoon-server ]
+  merge_group:
   pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master, master-ru, arumoon-server ]
-    paths:
-      - '**.cs'
-      - '**.csproj'
-      - '**.sln'
-      - '**.git**'
-      - '**.yml'
-      - 'RobustToolbox'
-      - 'RobustToolbox/**'
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
@@ -68,3 +52,11 @@ jobs:
       run: |
         $env:DOTNET_gcServer=1
         dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
+  ci-success:
+    name: Build & Test Release
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0

.github/workflows/gitlab-mirror.yml

@@ -0,0 +1,27 @@
+name: Mirror and run GitLab CI
+
+on: [push]
+
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Mirror + trigger CI
+      uses: SvanBoxel/gitlab-mirror-and-ci-action@master
+      with:
+        args: "https://git.arumoon.ru/Workbench-Team/space-station-14"
+      env:
+        FOLLOW_TAGS: "true"
+        FORCE_PUSH: "false"
+        GITLAB_HOSTNAME: "git.arumoon.ru"
+        GITLAB_USERNAME: "AruMoon"
+        GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
+        GITLAB_PROJECT_ID: "4"
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -57,3 +57,8 @@ jobs:
         key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
         script: /home/wizards-build-push/push.ps1 ${{ github.sha }}
 
+    - name: Publish changelog
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}

.github/workflows/test-packaging.yml

@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master, master-ru, arumoon-server ]
+    branches: [ master, staging, trying, master-ru, arumoon-server ]
     paths:
       - '**.cs'
       - '**.csproj'
@@ -13,7 +13,9 @@ on:
       # why not just do both
       - 'RobustToolbox'
       - 'RobustToolbox/**'
+  merge_group:
   pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ master, master-ru, arumoon-server ]
     paths:
       - '**.cs'
@@ -26,7 +28,8 @@ on:
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    name: Test Packaging
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/validate-rgas.yml

@@ -1,9 +1,15 @@
 name: YAML schema validator
-on: [pull_request, push]
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   yaml-schema-validation:
-    if: github.actor != 'PJBot'
+    name: YAML RGA schema validator
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

.github/workflows/validate-rsis.yml

@@ -1,6 +1,9 @@
 name: RSI Validator
 
 on:
+  push:
+    branches: [ staging, trying ]
+  merge_group:
   pull_request:
     paths:
       - '**.rsi/**'

.github/workflows/validate_mapfiles.yml

@@ -1,8 +1,15 @@
 name: YAML schema validator
-on: [pull_request, push]
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   yaml-schema-validation:
+    name: YAML map schema validator
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

.github/workflows/yaml-linter.yml

@@ -1,10 +1,16 @@
 name: YAML Linter
 
-on: [pull_request, push]
+on:
+  push:
+    branches: [ master, staging, trying ]
+  merge_group:
+  pull_request:
+    types: [ opened, reopened, synchronize, ready_for_review ]
 
 jobs:
   build:
-    if: github.actor != 'PJBot'
+    name: YAML Linter
+    if: github.actor != 'PJBot' && github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.gitlab-ci.yml

@@ -0,0 +1,35 @@
+image: mcr.microsoft.com/dotnet/sdk:7.0
+
+stages:
+  - publish
+
+publish:
+  stage: publish
+  retry: 2
+  interruptible: true
+  rules:
+    - if: '$SSH_PRIVATE_KEY != null'
+  script:
+    - apt update && apt upgrade -y
+    - apt install -y python3 libfreetype6 openssh-client rsync
+    - mkdir .git/hooks -p
+    - python3 RUN_THIS.py
+    - Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64 > server_build.log
+    - Tools/package_client_build.py > client_build.log
+    - Tools/gen_build_info.py
+    - mkdir release/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA
+    - mv release/*.zip release/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA
+    - eval $(ssh-agent -s)
+    - ssh-add - <<< "${SSH_PRIVATE_KEY}"
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - ssh-keyscan $SSH_REMOTE_IP >> ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+    - rsync -avz release/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA $SSH_USER@$SSH_REMOTE_IP:~/builds/builds/
+    - ssh $SSH_USER@$SSH_REMOTE_IP "~/push.ps1 $CI_COMMIT_REF_NAME-$CI_COMMIT_SHA $CI_COMMIT_REF_NAME"
+  artifacts:
+    name: "$CI_COMMIT_REF_NAME"
+    paths:
+      - release/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA
+      - server_build.log
+      - client_build.log

.gitlab/issue_templates/Default.md

@@ -0,0 +1,11 @@
+## Описание
+<!-- Подробно объясните свой вопрос. Вопросы без надлежащего объяснения могут быть закрыты мейнтейнерами. -->
+
+**Репродукция**
+<!-- Опишите шаги для репродукции (100% шанса получения проблемы), если применимо -->
+
+**Скриншоты**
+<!-- Если применимо, добавьте скриншоты для объяснения вашей проблемы -->
+
+**Дополнительный контекст**
+<!-- Добавьте сюда любой другой контекст о проблеме. Все, что, по вашему мнению, имеет отношение к проблеме. -->