Skip to content

Commit a46e115

Browse files
Peptide90Peptide90
committed
Merge remote-tracking branch 'origin/master' into APCs
2 parents 999fdcd + 568f40a commit a46e115

File tree

12,313 files changed

+2487322
-2002590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

12,313 files changed

+2487322
-2002590
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ csharp_preserve_single_line_blocks = true
196196
#dotnet_naming_style.begins_with_i.word_separator =
197197
#dotnet_naming_style.begins_with_i.capitalization = pascal_case
198198

199-
199+
dotnet_diagnostic.IDE0055.severity = warning
200200

201201
dotnet_naming_rule.constants_rule.severity = warning
202202
dotnet_naming_rule.constants_rule.style = upper_camel_case_style

‎.envrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
2+
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
3+
fi
4+
use flake

‎.github/CODEOWNERS

Lines changed: 73 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,76 @@
1-
/Content.*/Nuclear14/* @Just-a-Unity-Dev # I'm a pretty good C# dev, I guess
2-
/.github/ @Just-a-Unity-Dev # This is sysadmin territory, I'll review your PR before merging it
3-
4-
*.ftl @Just-a-Unity-Dev # Just to skim and make sure everything you have works
1+
/Content.*/Nuclear14/* @Peptide90 @Partmedia @Cheackraze
2+
/.github/ @Partmedia
53

64
/Resources/Prototypes/Nuclear14/* @Peptide90 @Just-a-Unity-Dev
75
/Resources/Textures/Nuclear14/* @Peptide90
6+
7+
# Sorting by path instead of by who added it one day :(
8+
/Resources/ConfigPresets/WizardsDen/ @Chief-Engineer
9+
10+
# Moony's Gargantuan List Of Things She Cares About, or MGLOTSCA for short.
11+
# You need to add your name to these entries, not make a new one, if you care about them.
12+
/Content.*/Bql/ @moonheart08
13+
/Content.*/Administration/ @moonheart08 @PaulRitter @DrSmugleaf @Chief-Engineer
14+
/Content.*/Station/ @moonheart08
15+
/Content.*/Maps/ @moonheart08
16+
/Content.*/GameTicking/ @moonheart08 @EmoGarbage404
17+
/Resources/ServerInfo/ @moonheart08 @Chief-Engineer
18+
/Resources/ServerInfo/Guidebook/ @moonheart08 @EmoGarbage404
19+
/Resources/engineCommandPerms.yml @moonheart08 @Chief-Engineer
20+
/Resources/clientCommandPerms.yml @moonheart08 @Chief-Engineer
21+
/Resources/Prototypes/species.yml @moonheart08
22+
/Resources/Prototypes/Body/ @moonheart08 @mirrorcult @DrSmugleaf # suffering
23+
/Resources/Prototypes/Maps/ @moonheart08 @Emisse
24+
/Resources/Prototypes/Entities/Mobs/Player/ @moonheart08 @mirrorcult @DrSmugleaf
25+
/Resources/Prototypes/Entities/Mobs/Species/ @moonheart08 @mirrorcult @DrSmugleaf
26+
27+
/Content.*/Body/ @mirrorcult @DrSmugleaf
28+
/Content.*/Chemistry/ @mirrorcult
29+
/Content.*/StatusEffect/ @mirrorcult
30+
/Content.*/Whitelist/ @mirrorcult
31+
/Resources/Prototypes/Reagents/ @mirrorcult
32+
/Resources/Prototypes/Recipes/Reactions @mirrorcult
33+
/Resources/Prototypes/Chemistry @mirrorcult
34+
35+
/Content.*/Verbs/ @ElectroJr
36+
/Content.Client/ContextMenu/ @ElectroJr
37+
/Content.Shared/Damage/ @ElectroJr @DrSmugleaf
38+
/Content.Shared/Containers/ItemSlot/ @ElectroJr
39+
/Content.*/PowerCell/ @ElectroJr
40+
/Content.*/Doors/ @ElectroJr
41+
/Content.*/Interaction/ @ElectroJr
42+
/Content.*/Hands/ @ElectroJr
43+
/Content.*/Actions/ @ElectroJr
44+
/Content.*/Explosion/ @ElectroJr
45+
46+
/Content.*/Anomaly/ @EmoGarbage404
47+
/Content.*/Lathe/ @EmoGarbage404
48+
/Content.*/Materials/ @EmoGarbage404
49+
/Content.*/Mech/ @EmoGarbage404
50+
/Content.*/Research/ @EmoGarbage404
51+
/Content.*/Stack/ @EmoGarbage404
52+
/Content.*/Xenoarchaeology/ @EmoGarbage404
53+
/Content.*/Zombies/ @EmoGarbage404
54+
/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml @EmoGarbage404
55+
/Resources/Prototypes/Research/ @EmoGarbage404
56+
57+
/Content.*/Forensics/ @ficcialfaint
58+
59+
/Content.YAMLLinter @PaulRitter @DrSmugleaf
60+
/Content.*/Inventory @PaulRitter
61+
/Content.*/Arcade @PaulRitter
62+
/Content.*/Conveyor @PaulRitter
63+
/Content.*/Decals @PaulRitter
64+
/Content.*/Objectives @PaulRitter
65+
/Content.*/MachineLinking @PaulRitter
66+
/Content.*/Crayon @PaulRitter
67+
/Content.*/Clothing @PaulRitter
68+
69+
# Be they Fluent translations or Freemarker templates, I know them both!
70+
*.ftl @RemieRichards
71+
72+
# SKREEEE
73+
/Content.*.Database/ @PJB3005 @DrSmugleaf
74+
/Content.Shared.Database/Log*.cs @PJB3005 @DrSmugleaf @Chief-Engineer
75+
/Pow3r/ @PJB3005
76+
/Content.Server/Power/Pow3r/ @PJB3005

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
contact_links:
2-
- name: Report a Security Exploit
3-
url: https://discord.gg/MwDDf6t
4-
about: Please report serious security exploits and vulnerabilities to @PJB3005 (PJB#3005/97089048065097728 on Discord).
2+
- name: Report a Security Vulnerability
3+
url: https://github.com/space-wizards/space-station-14/blob/master/SECURITY.md
4+
about: Please report security vulnerabilities privately so we can fix them before they are publicly disclosed.
55
- name: Request a Feature
66
url: https://discord.gg/rGvu9hKffJ
77
about: Submit feature requests on our Discord server (https://discord.gg/rGvu9hKffJ).

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

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,11 @@ name: Build & Test Debug
22

33
on:
44
push:
5-
branches: [ master ]
6-
paths:
7-
- '**.cs'
8-
- '**.csproj'
9-
- '**.sln'
10-
- '**.git**'
11-
- '**.yml'
12-
# no docs on which one of these is supposed to work, so
13-
# why not just do both
14-
- 'RobustToolbox'
15-
- 'RobustToolbox/**'
5+
branches: [ master, staging, trying ]
6+
merge_group:
167
pull_request:
178
types: [ opened, reopened, synchronize, ready_for_review ]
189
branches: [ master ]
19-
paths:
20-
- '**.cs'
21-
- '**.csproj'
22-
- '**.sln'
23-
- '**.git**'
24-
- '**.yml'
25-
- 'RobustToolbox'
26-
- 'RobustToolbox/**'
2710

2811
jobs:
2912
build:
@@ -59,13 +42,21 @@ jobs:
5942
run: dotnet restore
6043

6144
- name: Build Project
62-
run: dotnet build --configuration Debug --no-restore /p:WarningsAsErrors=nullable /m
45+
run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m
6346

6447
- name: Run Content.Tests
65-
run: dotnet test --no-build Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
48+
run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
6649

6750
- name: Run Content.IntegrationTests
6851
shell: pwsh
6952
run: |
7053
$env:DOTNET_gcServer=1
71-
dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
54+
dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
55+
ci-success:
56+
name: Build & Test Debug
57+
needs:
58+
- build
59+
runs-on: ubuntu-latest
60+
steps:
61+
- name: CI succeeded
62+
run: exit 0

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

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,11 @@ name: Build & Test Release
22

33
on:
44
push:
5-
branches: [ master ]
6-
paths:
7-
- '**.cs'
8-
- '**.csproj'
9-
- '**.sln'
10-
- '**.git**'
11-
- '**.yml'
12-
# no docs on which one of these is supposed to work, so
13-
# why not just do both
14-
- 'RobustToolbox'
15-
- 'RobustToolbox/**'
5+
branches: [ master, staging, trying ]
6+
merge_group:
167
pull_request:
178
types: [ opened, reopened, synchronize, ready_for_review ]
189
branches: [ master ]
19-
paths:
20-
- '**.cs'
21-
- '**.csproj'
22-
- '**.sln'
23-
- '**.git**'
24-
- '**.yml'
25-
- 'RobustToolbox'
26-
- 'RobustToolbox/**'
2710

2811
jobs:
2912
build:
@@ -59,13 +42,21 @@ jobs:
5942
run: dotnet restore
6043

6144
- name: Build Project
62-
run: dotnet build --configuration Release --no-restore /p:WarningsAsErrors=nullable /m
45+
run: dotnet build --configuration Tools --no-restore /p:WarningsAsErrors=nullable /m
6346

6447
- name: Run Content.Tests
65-
run: dotnet test --no-build Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
48+
run: dotnet test --configuration Tools --no-build Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
6649

6750
- name: Run Content.IntegrationTests
6851
shell: pwsh
6952
run: |
7053
$env:DOTNET_gcServer=1
71-
dotnet test --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
54+
dotnet test --configuration Tools --no-build Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
55+
ci-success:
56+
name: Build & Test Release
57+
needs:
58+
- build
59+
runs-on: ubuntu-latest
60+
steps:
61+
- name: CI succeeded
62+
run: exit 0

‎.github/workflows/publish.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16+
- name: Install dependencies
17+
run: sudo apt-get install -y python3-paramiko
18+
1619
- uses: actions/checkout@v2
1720
with:
1821
submodules: 'recursive'
@@ -57,3 +60,13 @@ jobs:
5760
key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
5861
script: "python3 /var/www/builds.nuclear14.com/manifest.py -c n14 -v ${{ github.sha }}"
5962

63+
- name: Publish changelog (Discord)
64+
run: Tools/actions_changelogs_since_last_run.py
65+
env:
66+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
68+
69+
- name: Publish changelog (RSS)
70+
run: Tools/actions_changelog_rss.py
71+
env:
72+
CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}

‎.github/workflows/rsi-diff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Get changed files
1717
id: files
18-
uses: Ana06/get-changed-files@v1.2
18+
uses: Partmedia/get-changed-files@95b8305e7b76a231dc261982c3faee2889329a20
1919
with:
2020
format: 'space-delimited'
2121

‎.github/workflows/test-packaging.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ master, staging, trying ]
66
paths:
77
- '**.cs'
88
- '**.csproj'
@@ -13,6 +13,7 @@ on:
1313
# why not just do both
1414
- 'RobustToolbox'
1515
- 'RobustToolbox/**'
16+
merge_group:
1617
pull_request:
1718
types: [ opened, reopened, synchronize, ready_for_review ]
1819
branches: [ master ]
@@ -27,6 +28,7 @@ on:
2728

2829
jobs:
2930
build:
31+
name: Test Packaging
3032
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
3133
runs-on: ubuntu-latest
3234

‎.github/workflows/validate-rgas.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
name: YAML license validator
1+
name: RGA schema validator
22
on:
33
push:
4+
branches: [ master ]
5+
merge_group:
46
pull_request:
57
types: [ opened, reopened, synchronize, ready_for_review ]
68

79
jobs:
810
yaml-schema-validation:
11+
name: YAML RGA schema validator
912
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
1013
runs-on: ubuntu-latest
1114
steps:

‎.github/workflows/validate-rsis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: RSI Validator
22

33
on:
4+
push:
5+
branches: [ staging, trying ]
6+
merge_group:
47
pull_request:
58
paths:
69
- '**.rsi/**'

‎.github/workflows/validate_mapfiles.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
name: Map YAML validator
1+
name: Map file schema validator
22
on:
33
push:
4+
branches: [ master, staging, trying ]
5+
merge_group:
46
pull_request:
57
types: [ opened, reopened, synchronize, ready_for_review ]
68

79
jobs:
810
yaml-schema-validation:
11+
name: YAML map schema validator
912
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
1013
runs-on: ubuntu-latest
1114
steps:

‎.github/workflows/yaml-linter.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ name: YAML Linter
22

33
on:
44
push:
5+
branches: [ master, staging, trying ]
6+
merge_group:
57
pull_request:
68
types: [ opened, reopened, synchronize, ready_for_review ]
79

810
jobs:
911
build:
12+
name: YAML Linter
1013
if: github.actor != 'PJBot' && github.event.pull_request.draft == false
1114
runs-on: ubuntu-latest
1215
steps:

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,3 +301,7 @@ Resources/MapImages
301301
/Content.Docfx/api/
302302
/Content.Docfx/*site
303303

304+
*.bak
305+
306+
# Direnv stuff
307+
.direnv/

‎.run/Content Server+Client.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
<toRun name="Content.Server" type="DotNetProject" />
55
<method v="2" />
66
</configuration>
7-
</component>
7+
</component>

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"omnisharp.analyzeOpenDocumentsOnly": true
3+
}

‎BuildChecker/BuildChecker.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@ https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3333
<OutputPath>bin\Release\</OutputPath>
3434
</PropertyGroup>
35+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Tools|AnyCPU' ">
36+
<OutputPath>bin\Tools\</OutputPath>
37+
</PropertyGroup>
38+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugOpt|AnyCPU' ">
39+
<OutputPath>bin\DebugOpt\</OutputPath>
40+
</PropertyGroup>
3541
<Target Name="Build">
3642
<Exec Command="$(Python) git_helper.py" CustomErrorRegularExpression="^Error" />
3743
</Target>

‎Content.Benchmarks/Content.Benchmarks.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@
2525
<ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
2626
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
2727
</ItemGroup>
28-
<Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
2928
</Project>

0 commit comments

Comments
 (0)