mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-09 10:21:18 +03:00
# Conflicts: # .github/workflows/publish.yml # Content.Packaging/ContentPackaging.cs # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Resources/Audio/Weapons/Guns/Gunshots/license.txt # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png |
||
|---|---|---|
| .. | ||
| benchmarks.yml | ||
| build-docfx.yml | ||
| build-map-renderer.yml | ||
| build-test-debug.yml | ||
| conflict-labeler.yml | ||
| labeler-approve.yml | ||
| labeler-changes.yml | ||
| labeler-needsreview.yml | ||
| labeler-pr.yml | ||
| no-submodule-update.yml | ||
| publish-publish.yml | ||
| publish.yml | ||
| rsi-diff.yml | ||
| test-packaging.yml | ||
| update-credits.yml | ||
| update-wiki.yml | ||
| validate-rgas.yml | ||
| validate-rsis.yml | ||
| validate_mapfiles.yml | ||
| yaml-linter.yml | ||