-
Notifications
You must be signed in to change notification settings - Fork 473
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' of https://github.com/Yatiyaya/frontier-station-14
- Loading branch information
Showing
6,907 changed files
with
1,969,509 additions
and
1,702,812 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| # Last match in file takes precedence. | ||
|
|
||
| # Sorting by path instead of by who added it one day :( | ||
| # this isn't how codeowners rules work pls read the first comment instead of trying to force a sorting order | ||
| #/Resources/ConfigPresets/WizardsDen/ @Chief-Engineer | ||
|
|
||
| # Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short. | ||
| # You need to add your name to these entries, not make a new one, if you care about them. | ||
| #/Content.*/Toolshed/ @moonheart08 | ||
| #**/Toolshed/** @moonheart08 | ||
| #*Command.cs @moonheart08 | ||
| #/Content.*/Administration/ @moonheart08 @DrSmugleaf @Chief-Engineer | ||
| #/Content.*/Station/ @moonheart08 | ||
| #/Content.*/Maps/ @moonheart08 | ||
| #/Content.*/GameTicking/ @moonheart08 @EmoGarbage404 | ||
| #/Resources/ServerInfo/ @moonheart08 @Chief-Engineer | ||
| #/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404 | ||
| #/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer | ||
| #/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer | ||
|
|
||
| #/Resources/Prototypes/Maps/ @Emisse | ||
|
|
||
| #/Resources/Prototypes/Body/ @DrSmugleaf # suffering | ||
| #/Resources/Prototypes/Entities/Mobs/Player/ @DrSmugleaf | ||
| #/Resources/Prototypes/Entities/Mobs/Species/ @DrSmugleaf | ||
| #/Content.*/Body/ @DrSmugleaf | ||
| #/Content.YAMLLinter @DrSmugleaf | ||
| #/Content.Shared/Damage/ @DrSmugleaf | ||
|
|
||
| #/Content.*/Anomaly/ @EmoGarbage404 | ||
| #/Content.*/Lathe/ @EmoGarbage404 | ||
| #/Content.*/Materials/ @EmoGarbage404 | ||
| #/Content.*/Mech/ @EmoGarbage404 | ||
| #/Content.*/Research/ @EmoGarbage404 | ||
| #/Content.*/Stack/ @EmoGarbage404 | ||
| #/Content.*/Xenoarchaeology/ @EmoGarbage404 | ||
| #/Content.*/Zombies/ @EmoGarbage404 | ||
| #/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404 | ||
| #/Resources/Prototypes/Research/ @EmoGarbage404 | ||
|
|
||
| #/Content.*/Forensics/ @ficcialfaint | ||
|
|
||
| # SKREEEE | ||
| #/Content.*.Database/ @PJB3005 @DrSmugleaf | ||
| #/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer | ||
| #/Pow3r/ @PJB3005 | ||
| #/Content.Server/Power/Pow3r/ @PJB3005 | ||
|
|
||
| # notafet | ||
| #/Content.*/Atmos/ @Partmedia | ||
| #/Content.*/Botany/ @Partmedia | ||
|
|
||
| #Jezi | ||
| #/Content.*/Medical @Jezithyr | ||
| #/Content.*/Body @Jezithyr | ||
|
|
||
| ## Frontier goes here: | ||
|
|
||
| # Config files | ||
| /Resources/ConfigPresets/* @Cheackraze | ||
|
|
||
| # Mapchecker | ||
| /.github/mapchecker/* @TsjipTsjip | ||
| /.github/workflows/frontier-mapchecker.yml @TsjipTsjip | ||
|
|
||
| # All maps | ||
| /Resources/Maps/_NF/* @MagnusCrowe | ||
| /Resources/Prototypes/_NF/Shipyard/* @MagnusCrowe | ||
|
|
||
| # Bluespace Events | ||
| /Resources/Maps/_NF/Bluespace/asteroidbunker.yml @MagnusCrowe @FoxxoTrystan | ||
| /Resources/Maps/_NF/Bluespace/asteroidvault.yml @MagnusCrowe @FoxxoTrystan | ||
|
|
||
| # Shuttles | ||
| # McCargo | ||
| /Resources/Maps/_NF/Shuttles/mccargo.yml @MagnusCrowe @dvir001 | ||
| /Resources/Prototypes/_NF/Shipyard/mccargo.yml @MagnusCrowe @dvir001 | ||
| # McDelivery | ||
| /Resources/Maps/_NF/Shuttles/mcdelivery.yml @MagnusCrowe @dvir001 | ||
| /Resources/Prototypes/_NF/Shipyard/mcdelivery.yml @MagnusCrowe @dvir001 | ||
| # Hunter | ||
| /Resources/Maps/_NF/Shuttles/hunter.yml @MagnusCrowe @FoxxoTrystan | ||
| /Resources/Prototypes/_NF/Shipyard/hunter.yml @MagnusCrowe @FoxxoTrystan | ||
| # Infiltrator | ||
| /Resources/Maps/_NF/Shuttles/infiltrator.yml @MagnusCrowe @FoxxoTrystan | ||
| /Resources/Prototypes/_NF/Shipyard/infiltrator.yml @MagnusCrowe @FoxxoTrystan | ||
|
|
||
| # Races - Trystan wanted a ping on this | ||
| /Resources/Prototypes/Entities/Mobs/Player/* @FoxxoTrystan | ||
| /Resources/Prototypes/Entities/Mobs/Species/* @FoxxoTrystan | ||
| /Resources/Prototypes/DeltaV/Entities/Mobs/Species/* @FoxxoTrystan | ||
| /Resources/Prototypes/DeltaV/Entities/Mobs/Player/* @FoxxoTrystan | ||
| /Resources/Prototypes/_Nyano/Entities/Mobs/Species/* @FoxxoTrystan | ||
| /Resources/Prototypes/_Nyano/Entities/Mobs/Player/* @FoxxoTrystan |
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,80 +1,15 @@ | ||
| # POI's | ||
| Frontier: true | ||
| nfsd: true | ||
|
|
||
| anomalouslab: | ||
| - WallPlastitaniumIndestructible | ||
| - WallPlastitanium | ||
| - PlastitaniumWindow | ||
| Cove: | ||
| - WallPlastitanium | ||
| - HighSecDoor | ||
| Lodge: | ||
| - WallPlastitanium | ||
| - HighSecDoor | ||
|
|
||
|
|
||
| # TECHNICAL DEBT BELOW. These ones were added to this list to ensure other PR's would not break upon merging. It is | ||
| # the intention for this list to become empty in separate PR's. | ||
| Esquire: | ||
| - ToyFigurineSecurity | ||
| - AirlockSecurity | ||
| - SignSec | ||
| Bison: | ||
| - WallPlastitanium | ||
| - WallPlastitaniumDiagonal | ||
| Sprinter: | ||
| - WallPlastitanium | ||
| - IntercomSecurity | ||
| - IntercomCommand | ||
| Courser: | ||
| - HighSecDoor | ||
| Metastable: | ||
| - SignSec | ||
| DartX: | ||
| - HighSecDoor | ||
| gourd: | ||
| - HoloprojectorSecurity | ||
| Praeda: | ||
| - ClothingEyesGlassesSecurity | ||
| - EncryptionKeyCommand | ||
| - EncryptionKeyEngineering | ||
| Pheonix: | ||
| - DebugSubstation | ||
| - WallPlastitanium | ||
| Spectre: | ||
| - AirlockSecurity | ||
| - EncryptionKeyMedicalScience | ||
| Bazaar: | ||
| - AirlockSecurity | ||
| Anchor: | ||
| - AirlockSecurity | ||
| - IntercomCommand | ||
| DecadeDove: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| RosebudMKI: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| - EncryptionKeyScience | ||
| - EncryptionKeyService | ||
| Dragonfly: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| Opportunity: | ||
| - EncryptionKeySecurity | ||
| RosebudMKII: | ||
| - EncryptionKeyCargo | ||
| - EncryptionKeyEngineering | ||
| - EncryptionKeyScience | ||
| - EncryptionKeyService | ||
| Crescent: | ||
| - EncryptionKeyScience | ||
| - IntercomCommand | ||
| Pathfinder: | ||
| - IntercomCommand | ||
| Schooner: | ||
| - IntercomCommand | ||
| Marauder: | ||
| - IntercomCommand | ||
| Empress: | ||
| - IntercomAll | ||
| #DartX: | ||
| # - HighSecDoor |
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 |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ jobs: | |
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
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,25 +14,32 @@ jobs: | |
|
|
||
| steps: | ||
| - name: Install dependencies | ||
| run: sudo apt-get install -y python3-paramiko | ||
| run: sudo apt-get install -y python3-paramiko python3-lxml | ||
|
|
||
| - uses: actions/[email protected] | ||
| with: | ||
| submodules: 'recursive' | ||
| - name: Setup .NET Core | ||
| uses: actions/[email protected] | ||
| with: | ||
| dotnet-version: 7.0.x | ||
| dotnet-version: 8.0.x | ||
|
|
||
| - name: Get Engine Tag | ||
| run: | | ||
| cd RobustToolbox | ||
| git fetch --depth=1 | ||
| - name: Install dependencies | ||
| run: dotnet restore | ||
|
|
||
| - name: Build Packaging | ||
| run: dotnet build Content.Packaging --configuration Release --no-restore /m | ||
|
|
||
| - name: Package server | ||
| run: dotnet run --project Content.Packaging server --platform win-x64 --platform linux-x64 --platform osx-x64 --platform linux-arm64 | ||
|
|
||
| - name: Package client | ||
| run: | | ||
| Tools/package_server_build.py -p win-x64 linux-x64 osx-x64 linux-arm64 | ||
| Tools/package_client_build.py | ||
| run: dotnet run --project Content.Packaging client --no-wipe-release | ||
|
|
||
| - name: Update Build Info | ||
| run: Tools/gen_build_info.py | ||
|
|
||
Oops, something went wrong.