Merge pull request #2 from Spatison/upstream

Upstream

.envrc

@@ -1,4 +1,5 @@
+set -e
 if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
 fi
-use nix
+use nix

.github/CODEOWNERS

@@ -1,5 +1,107 @@
-# Last match in file takes precedence.
+# hasn't specified or all
+* @sleepyyapril @Remuchi
 
-# TODO
-@Remuchi
-@DVOniksWyvern
+/.* @DEATHB4DEFEAT
+*.sln @DEATHB4DEFEAT
+*.csproj @DEATHB4DEFEAT
+*.dotsettings @DEATHB4DEFEAT
+*.DotSettings @DEATHB4DEFEAT
+*.toml @DEATHB4DEFEAT
+/Content.*/IoC @DEATHB4DEFEAT
+
+
+# Nix
+*.nix @DEATHB4DEFEAT @stellar-novas
+/flake.lock @DEATHB4DEFEAT @stellar-novas
+/.envrc @DEATHB4DEFEAT @stellar-novas
+
+
+# UI
+*.xaml @DEATHB4DEFEAT
+*.xaml.cs @DEATHB4DEFEAT
+
+# Lobby
+/Content.Client/Lobby @DEATHB4DEFEAT
+/Content.Client/MainMenu @DEATHB4DEFEAT
+
+# Queue
+/Content.*/DiscordAuth @DEATHB4DEFEAT
+/Content.*/JoinQueue @DEATHB4DEFEAT
+
+
+# Writing
+*.xml @DEATHB4DEFEAT
+*.ftl @DEATHB4DEFEAT
+*.md @DEATHB4DEFEAT
+*.txt @DEATHB4DEFEAT
+
+# Shaders
+*.swsl @DEATHB4DEFEAT
+/Resources/Prototypes/Shaders @DEATHB4DEFEAT
+
+# Overlays
+/Content.Client/Overlays @DEATHB4DEFEAT
+
+# Paint
+/Content.*/Paint @DEATHB4DEFEAT
+
+
+# Parkstation/etc
+**/SimpleStation14 @DEATHB4DEFEAT
+**/Parkstation @DEATHB4DEFEAT
+
+# Announcer system
+/Content.*/Announcements @DEATHB4DEFEAT
+/Content.Server/StationEvents @DEATHB4DEFEAT
+
+# SSD
+/Content.*/SSDIndicator @DEATHB4DEFEAT
+
+# Station Goals
+/Content.Server/StationGoal @DEATHB4DEFEAT
+
+# Random Bark
+/Content.Server/Speech/Components/RandomBarkComponent.cs @DEATHB4DEFEAT
+/Content.Server/Speech/Systems/RandomBarkSystem.cs @DEATHB4DEFEAT
+/Resources/Locale/en-US/random-barks @DEATHB4DEFEAT
+
+# Punpun
+/Content.Server/Punpun @DEATHB4DEFEAT
+
+
+# Database
+/Content.*/Database @DEATHB4DEFEAT
+/Content.*/.Database @DEATHB4DEFEAT
+
+# Preferences
+/Content.*/Preferences @DEATHB4DEFEAT
+**/*CVar*/*.cs @DEATHB4DEFEAT
+
+# Discord
+/Content.*/Discord* @DEATHB4DEFEAT
+
+# Loadouts
+/Resources/Prototypes/Loadouts @angelofallars
+/Resources/Prototypes/CharacterItemGroups @angelofallars
+/Resources/Locale/en-US/loadouts @angelofallars
+
+# Traits
+/Resources/Prototypes/Traits @angelofallars
+/Resources/Locale/en-US/traits @angelofallars
+
+# Throwing
+/Content.*/DamageOtherOnHit @angelofallars
+/Content.*/Embed @angelofallars
+/Content.*/ProjectileSystem @angelofallars
+/Content.*/ThrownItem @angelofallars
+/Content.*/ThrowEvent @angelofallars
+
+# Nyano Systems
+/Content.*/Weapons @VMSolidus
+/Content.*/Abilities/Psionics @VMSolidus
+/Content.*/Psionics @VMSolidus
+/Content.*/Contests @VMSolidus
+/Content.*/Carrying @VMSolidus
+
+# Physics Stuff
+/Content.*/Atmos @VMSolidus

.github/workflows/build-docfx.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/build-map-renderer.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 9.0.x
 
       - name: Install dependencies
         run: dotnet restore

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

@@ -36,7 +36,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.0.x
 
     - name: Install dependencies
       run: dotnet restore
@@ -51,7 +51,7 @@ jobs:
       shell: pwsh
       run: |
         $env:DOTNET_gcServer=1
-        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
+        dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0
   ci-success:
     name: Build & Test Debug
     needs:

.github/workflows/no-submodule-update.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   this_aint_right:
+    if: github.actor != 'sleepyyapril' && github.actor != 'VMSolidus' && github.actor != 'DEATHB4DEFEAT'
     name: Submodule update in pr found
     runs-on: ubuntu-latest
     steps:

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/[email protected]
       with:
-        dotnet-version: 8.0.100
+        dotnet-version: 9.0.x
 
     - name: Get Engine Tag
       run: |

.github/workflows/rsi-diff.yml

@@ -15,9 +15,12 @@ jobs:
 
       - name: Get changed files
         id: files
-        uses: Ana06/get-changed-files@v1.2
+        uses: Ana06/get-changed-files@v2.3.0
         with:
           format: 'space-delimited'
+          filter: | 
+            **.rsi
+            **.png
 
       - name: Diff changed RSIs
         id: diff

.github/workflows/test-packaging.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 9.0.x
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/yaml-linter.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/[email protected]
         with:
-          dotnet-version: 8.0.100
+          dotnet-version: 9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

.vscode/launch.json

@@ -4,6 +4,7 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        // CLIENT CONFIGS
         {
             "name": "Client",
             "type": "coreclr",
@@ -14,14 +15,56 @@
             "stopAtEntry": false
         },
         {
-            "name": "Client (Compatibility renderer)",
+            "name": "Client (Tools)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build (Tools)",
+            "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
+            "args": [],
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": "Client (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build (Release)",
+            "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
+            "args": [],
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        // COMPATABILITY RENDERERS
+        {
+            "name": "Client (Compatibility Renderer)",
             "type": "coreclr",
             "request": "launch",
             "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
             "args": "--cvar display.compat=true",
             "console": "internalConsole",
             "stopAtEntry": false
         },
+        {
+            "name": "Client (Tools) - (Compatability Renderer)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build (Tools)",
+            "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
+            "args": ["--cvar display.compat=true"],
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": "Client (Release) - (Compatability Renderer)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build (Release)",
+            "program": "${workspaceFolder}/bin/Debug/Content.Client/Content.Client.dll",
+            "args": ["--cvar display.compat=true"],
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        // SERVER CONFIGS
         {
             "name": "Server",
             "type": "coreclr",
@@ -31,6 +74,27 @@
             "console": "integratedTerminal",
             "stopAtEntry": false
         },
+        {
+            "name": "Server (Tools)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build (Tools)",
+            "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
+            "args": [],
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": "Server (Release)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build (Release)",
+            "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
+            "args": [],
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        // LINTER
         {
             "name": "YAML Linter",
             "type": "coreclr",
@@ -50,6 +114,22 @@
                 "Client"
             ],
             "preLaunchTask": "build"
+        },
+        {
+            "name": "Server/Client (Tools)",
+            "configurations": [
+                "Server (Tools)",
+                "Client (Tools)"
+            ],
+            "preLaunchTask": "build (Tools)"
+        },
+        {
+            "name": "Server/Client (Release)",
+            "configurations": [
+                "Server (Release)",
+                "Client (Release)"
+            ],
+            "preLaunchTask": "build (Release)"
         }
     ]
-}
+}

.vscode/tasks.json

@@ -21,6 +21,46 @@
             },
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "build (Tools)",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "--configuration",
+                "Tools",
+                "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
+                "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": false
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build (Release)",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "--configuration",
+                "Release",
+                "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
+                "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": false
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "build-yaml-linter",
             "command": "dotnet",
@@ -34,4 +74,4 @@
             "problemMatcher": "$msCompile"
         }
     ]
-}
+}