fixes

This reverts commit f3919fafc1.

.editorconfig

@@ -348,7 +348,7 @@ resharper_csharp_qualified_using_at_nested_scope = false
 resharper_csharp_prefer_qualified_reference = false
 resharper_csharp_allow_alias = false
 
-[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props,json}]
+[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props,json,slnx}]
 indent_size = 2
 
 [nuget.config]

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,3 @@
-<!-- Guidelines: https://docs.spacestation14.io/en/getting-started/pr-guideline -->
 
 ## About the PR
 <!-- What did you change? -->
@@ -7,23 +6,23 @@
 ## Why / Balance
 <!-- Discuss how this would affect game balance or explain why it was changed. Link any relevant discussions or issues. -->
 
-## How to test
-<!-- Describe the way it can be tested -->
-
 ## Media
 <!-- Attach media if the PR makes ingame changes (clothing, items, features, etc). 
 Small fixes/refactors are exempt. Media may be used in SS14 progress reports with credit. -->
 
 ## Requirements
 <!-- Confirm the following by placing an X in the brackets [X]: -->
-- [ ] I have read and am following the [Pull Request and Changelog Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
+- [ ] I have read relevant guidelines/documentation to this PR found on [our devwiki](https://monolith-station.github.io/mono-docs/).
 - [ ] I have added media to this PR or it does not require an ingame showcase.
-- [ ] I can confirm this PR contains no AI-generated content, and did not use any AI-generated content.
+- [ ] I can confirm this PR contains either no AI-generated content, or AI-generated content that meets our guidelines.
 <!-- You should understand that not following the above may get your PR closed at maintainer’s discretion -->
+<!-- When using AI, make sure you are already proficient in creating whatever content you are attempting to generate and that you already have experience contributing to SS14. This means using AI to enhance your preexisting workflow, not vibecoding. -->
+
+## How to test
+<!-- Describe the way it can be tested -->
 
 ## Breaking changes
-<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them.
-This will be posted in #codebase-changes. -->
+<!-- List any breaking changes, including namespaces, public class/method/field changes, prototype renames; and provide instructions for fixing them. -->
 
 **Changelog**
 <!-- Add a Changelog entry to make players aware of new features or changes that could affect gameplay.

.github/Schemas/rga.yml

@@ -1,7 +1,3 @@
-# SPDX-FileCopyrightText: 2025 starch
-#
-# SPDX-License-Identifier: MPL-2.0
-
 # If this gets updated, make sure to also update https://github.com/space-wizards/RobustToolboxSpecifications
 
 list(include('attribution'), min=1)

.github/workflows/benchmarks.yml

@@ -1,8 +1,10 @@
-name: Benchmarks
+name: Benchmarks
 on:
   workflow_dispatch:
 
-concurrency: benchmarks
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   benchmark:

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

@@ -1,21 +1,3 @@
-# SPDX-FileCopyrightText: 2021 Javier Guardia Fernández
-# SPDX-FileCopyrightText: 2021 Paul Ritter
-# SPDX-FileCopyrightText: 2021 Swept
-# SPDX-FileCopyrightText: 2021 mirrorcult
-# SPDX-FileCopyrightText: 2022 0x6273
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 Moony
-# SPDX-FileCopyrightText: 2023 metalgearsloth
-# SPDX-FileCopyrightText: 2024 Checkraze
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Myra
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Cojoke
-# SPDX-FileCopyrightText: 2025 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Build & Test Map Renderer
 
 on:
@@ -26,6 +8,10 @@ on:
     types: [ opened, reopened, synchronize, ready_for_review ]
     branches: [ main, staging, stable ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     if: github.event.pull_request.draft == false
@@ -54,7 +40,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore

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

@@ -1,31 +1,9 @@
-# SPDX-FileCopyrightText: 2020 ComicIronic
-# SPDX-FileCopyrightText: 2020 Tyler Young
-# SPDX-FileCopyrightText: 2020 Ygg01
-# SPDX-FileCopyrightText: 2021 Javier Guardia Fernández
-# SPDX-FileCopyrightText: 2021 Swept
-# SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto
-# SPDX-FileCopyrightText: 2021 mirrorcult
-# SPDX-FileCopyrightText: 2022 0x6273
-# SPDX-FileCopyrightText: 2022 Kara D
-# SPDX-FileCopyrightText: 2022 Zoldorf
-# SPDX-FileCopyrightText: 2022 wrexbe
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 Kevin Zheng
-# SPDX-FileCopyrightText: 2023 Leon Friedrich
-# SPDX-FileCopyrightText: 2023 Moony
-# SPDX-FileCopyrightText: 2023 metalgearsloth
-# SPDX-FileCopyrightText: 2024 Checkraze
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Myra
-# SPDX-FileCopyrightText: 2024 Whatstone
-# SPDX-FileCopyrightText: 2025 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2025 Redrover1760
-# SPDX-FileCopyrightText: 2025 sleepyyapril
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Build & Test Debug
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     branches: [ main, staging, stable ]
@@ -62,7 +40,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Install dependencies
       run: dotnet restore

.github/workflows/changelog.yml

@@ -1,5 +1,5 @@
 name: PR Changelogs
-concurrency: commit_action
+concurrency: commit_action-${{ github.event.pull_request.base.ref }} # Mono
 on:
   pull_request_target:
     types: [closed]
@@ -16,11 +16,11 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: Checkout Master
+      - name: Checkout Base Branch # Mono
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.BOT_TOKEN }}
-          ref: "${{ vars.CHANGELOG_BRANCH }}"
+          ref: "${{ github.event.pull_request.base.ref }}" # Mono
 
       - name: Setup Git
         run: |
@@ -47,9 +47,9 @@ jobs:
 
       - name: Commit Changelog
         run: |
-          git pull origin main
+          git pull origin "${{ github.event.pull_request.base.ref }}"
           git add "${{ env.CHANGELOG_DIR }}"
           git commit -m "Automated Changelog (#${{ env.PR_NUMBER }})"
-          git push
+          git push origin "${{ github.event.pull_request.base.ref }}"
         shell: bash
         continue-on-error: true

.github/workflows/check-crlf.yml

@@ -1,4 +1,8 @@
-name: CRLF Check
+name: CRLF Check
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 on:
   pull_request:

.github/workflows/close-master-pr.yml

@@ -1,9 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2024 Vasilis
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Close PRs on master
 
 on:

.github/workflows/labeler-conflict.yml

@@ -1,14 +1,3 @@
-# SPDX-FileCopyrightText: 2022 Moony
-# SPDX-FileCopyrightText: 2022 ike709
-# SPDX-FileCopyrightText: 2022 metalgearsloth
-# SPDX-FileCopyrightText: 2022 wrexbe
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 SlamBamActionman
-# SPDX-FileCopyrightText: 2024 TsjipTsjip
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Check Merge Conflicts
 
 on:
@@ -19,6 +8,10 @@ on:
       - reopened
       - ready_for_review
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   Label:
     if: ( github.event.pull_request.draft == false )

.github/workflows/labeler-needsreview.yml

@@ -1,9 +1,13 @@
-name: "Labels: Review"
+name: "Labels: Review"
 
 on:
   pull_request_target:
     types: [review_requested]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   add_label:
     runs-on: ubuntu-latest

.github/workflows/labeler-pr.yml

@@ -1,17 +1,12 @@
-# SPDX-FileCopyrightText: 2022 metalgearsloth
-# SPDX-FileCopyrightText: 2022 mirrorcult
-# SPDX-FileCopyrightText: 2023 Kevin Zheng
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 TsjipTsjip
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: "Labels: PR"
 
 on:
 - pull_request_target
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   labeler:
     permissions:

.github/workflows/labeler-review.yml

@@ -1,7 +1,13 @@
 name: "Labels: Approved"
+
 on:
   pull_request_review:
     types: [submitted]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   add_label:
     # Change the repository name after you've made sure the team name is correct for your fork!

.github/workflows/labeler-size.yml

@@ -1,5 +1,10 @@
 name: "Labels: Size"
 on: pull_request_target
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   size-label:
     runs-on: ubuntu-latest

.github/workflows/labeler-stable.yml

@@ -7,6 +7,10 @@ on:
     branches:
       - 'stable'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   add_label:
     runs-on: ubuntu-latest

.github/workflows/labeler-staging.yml

@@ -7,6 +7,10 @@ on:
     branches:
       - 'staging'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   add_label:
     runs-on: ubuntu-latest

.github/workflows/labeler-untriaged.yml

@@ -1,4 +1,4 @@
-name: "Labels: Untriaged"
+name: "Labels: Untriaged"
 
 on:
   issues:
@@ -6,6 +6,10 @@ on:
   pull_request_target:
     types: [opened]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   add_label:
     runs-on: ubuntu-latest

.github/workflows/nf-mapchecker.yml

@@ -1,10 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 TsjipTsjip
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Whatstone
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Map Prototype Checker
 
 on:

.github/workflows/nf-shipyard-tests.yml

@@ -1,11 +1,3 @@
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Cojoke
-# SPDX-FileCopyrightText: 2025 Redrover1760
-# SPDX-FileCopyrightText: 2025 Whatstone
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Build & Run Shipyard Tests
 
 on:

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

@@ -5,6 +5,10 @@ on:
     paths:
       - 'RobustToolbox'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   this_aint_right:
     name: Submodule update in pr found

.github/workflows/prtitlecase.yml

@@ -1,8 +1,3 @@
-# SPDX-FileCopyrightText: 2024 DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
-# SPDX-FileCopyrightText: 2025 sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
-
 name: PR Title Case
 on:
   pull_request_target:

.github/workflows/publish.yml

@@ -1,30 +1,12 @@
-# SPDX-FileCopyrightText: 2021 Paul
-# SPDX-FileCopyrightText: 2022 0x6273
-# SPDX-FileCopyrightText: 2022 Paul Ritter
-# SPDX-FileCopyrightText: 2022 Vera Aguilera Puerto
-# SPDX-FileCopyrightText: 2023 Debug
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 metalgearsloth
-# SPDX-FileCopyrightText: 2024 Checkraze
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Jezithyr
-# SPDX-FileCopyrightText: 2024 Matt
-# SPDX-FileCopyrightText: 2024 Whatstone
-# SPDX-FileCopyrightText: 2025 Ark
-# SPDX-FileCopyrightText: 2025 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Publish
 
-concurrency:
-  group: publish
-
 on:
   workflow_dispatch:
   # Frontier: re-enabled autopublish bawk
 
+concurrency:
+  group: publish
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -39,7 +21,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3.2.0
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
 
     - name: Get Engine Tag
       run: |

.github/workflows/reuse-updater.yml

@@ -1,117 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Aiden
-# SPDX-FileCopyrightText: 2025 Aidenkrz
-# SPDX-FileCopyrightText: 2025 Redrover1760
-# SPDX-FileCopyrightText: 2025 sleepyyapril
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-name: Update REUSE Headers
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - ready_for_review
-
-jobs:
-  update_headers:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-        with:
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-          ref: ${{ github.head_ref }}
-          fetch-depth: 0
-          token: ${{ secrets.BOT_TOKEN }}
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Get Changed Files and PR Info
-        id: changed_files
-        env:
-           PR_BODY: ${{ github.event.pull_request.body }}
-           GH_TOKEN: ${{ secrets.BOT_TOKEN }}
-           GH_REPO: ${{ github.repository }}
-           PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: |
-          set -e # Exit script on first error
-
-          echo "Fetching files for PR #${PR_NUMBER} in repo ${GH_REPO}"
-
-          PR_FILES_JSON=$(curl -s -f -H "Authorization: token ${GH_TOKEN}" \
-            "https://api.github.com/repos/${GH_REPO}/pulls/${PR_NUMBER}/files")
-
-          if [ $? -ne 0 ]; then
-            echo "Error fetching PR files from GitHub API."
-            exit 1
-          fi
-          
-          if ! echo "$PR_FILES_JSON" | jq -e . > /dev/null; then
-             echo "Warning: Received empty or invalid JSON from GitHub API for PR files."
-             PR_FILES="" # Set PR_FILES to empty to avoid errors below
-          else
-             PR_FILES=$(echo "$PR_FILES_JSON" | jq -r '.[] | select(.filename != null) | "\(.status) \(.filename)"')
-          fi
-
-          if [ -z "$PR_FILES" ]; then
-            echo "No files found in PR."
-            ADDED_FILES=""
-            MODIFIED_FILES=""
-          else
-            ADDED_FILES=$(echo "$PR_FILES" | grep "^added" | grep -E '\.(cs|ya?ml)$' | sed 's/^added //' | xargs) || true
-            MODIFIED_FILES=$(echo "$PR_FILES" | grep "^modified" | grep -E '\.(cs|ya?ml)$' | sed 's/^modified //' | xargs) || true
-          fi
-
-          echo "Added Files: $ADDED_FILES"
-          echo "Modified Files: $MODIFIED_FILES"
-
-          echo "ADDED_FILES_LIST<<EOF" >> $GITHUB_ENV
-          echo "$ADDED_FILES" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-          echo "MODIFIED_FILES_LIST<<EOF" >> $GITHUB_ENV
-          echo "$MODIFIED_FILES" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-          echo "Checking PR body for license..."
-          if grep -q "LICENSE: MIT" <<< "$PR_BODY"; then
-            echo "PR_LICENSE=mit" >> $GITHUB_ENV
-            echo "License specified in PR: MIT"
-          elif grep -q "LICENSE: AGPL" <<< "$PR_BODY"; then
-            echo "PR_LICENSE=agpl" >> $GITHUB_ENV
-            echo "License specified in PR: AGPL"
-          elif grep -q "LICENSE: MPL" <<< "$PR_BODY"; then
-            echo "PR_LICENSE=mpl" >> $GITHUB_ENV
-            echo "License specified in PR: MPL"
-          else
-            echo "PR_LICENSE=mpl" >> $GITHUB_ENV
-            echo "No license specified in PR, using default: MPL"
-          fi
-
-      - name: Run REUSE Header Update Script
-        run: |
-          python Tools/update_pr_reuse_headers.py \
-            --files-added ${{ env.ADDED_FILES_LIST }} \
-            --files-modified ${{ env.MODIFIED_FILES_LIST }} \
-            --pr-license ${{ env.PR_LICENSE }} \
-            --pr-base-sha ${{ github.event.pull_request.base.sha }} \
-            --pr-head-sha ${{ github.event.pull_request.head.sha }}
-        working-directory: ${{ github.workspace }}
-
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: "chore: automatically update REUSE headers"
-          commit_user_name: ${{ vars.CHANGELOG_USER }}
-          commit_user_email: ${{ vars.CHANGELOG_EMAIL }}
-          commit_author: ${{ vars.CHANGELOG_USER }} <${{ vars.CHANGELOG_EMAIL }}>
-          skip_dirty_check: false
-          skip_fetch: true
-
-    

.github/workflows/rsi-diff.yml

@@ -5,6 +5,10 @@ on:
     paths:
       - '**.rsi/**.png'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   diff:
     name: Diff
@@ -18,7 +22,7 @@ jobs:
         uses: Ana06/get-changed-files@v2.3.0
         with:
           format: 'space-delimited'
-          filter: | 
+          filter: |
             **.rsi
             **.png
 

.github/workflows/test-packaging.yml

@@ -1,18 +1,3 @@
-# SPDX-FileCopyrightText: 2022 0x6273
-# SPDX-FileCopyrightText: 2022 wrexbe
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 Moony
-# SPDX-FileCopyrightText: 2023 metalgearsloth
-# SPDX-FileCopyrightText: 2024 Checkraze
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Myra
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Cojoke
-# SPDX-FileCopyrightText: 2025 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Test Packaging
 
 on:
@@ -41,6 +26,10 @@ on:
       - 'RobustToolbox'
       - 'RobustToolbox/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Test Packaging
@@ -66,7 +55,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Install dependencies
         run: dotnet restore

.github/workflows/update-credits.yml

@@ -1,13 +1,3 @@
-# SPDX-FileCopyrightText: 2023 Vasilis
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Kara
-# SPDX-FileCopyrightText: 2024 Whatstone
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Cojoke
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Update Contrib and Patreons in credits
 
 on:

.github/workflows/validate-rgas.yml

@@ -1,17 +1,3 @@
-# SPDX-FileCopyrightText: 2022 Paul Ritter
-# SPDX-FileCopyrightText: 2022 wrexbe
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 Moony
-# SPDX-FileCopyrightText: 2023 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2023 metalgearsloth
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Myra
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Cojoke
-# SPDX-FileCopyrightText: 2025 starch
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: RGA schema validator
 on:
   push:
@@ -20,6 +6,10 @@ on:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   yaml-schema-validation:
     name: YAML RGA schema validator

.github/workflows/validate-rsis.yml

@@ -1,15 +1,3 @@
-# SPDX-FileCopyrightText: 2021 ike709
-# SPDX-FileCopyrightText: 2021 mirrorcult
-# SPDX-FileCopyrightText: 2022 Paul Ritter
-# SPDX-FileCopyrightText: 2022 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 Moony
-# SPDX-FileCopyrightText: 2024 ErhardSteinhauer
-# SPDX-FileCopyrightText: 2024 Myra
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: RSI Validator
 
 on:
@@ -20,6 +8,10 @@ on:
     paths:
       - '**.rsi/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   validate_rsis:
     name: Validate RSIs

.github/workflows/validate_mapfiles.yml

@@ -1,17 +1,3 @@
-# SPDX-FileCopyrightText: 2022 Paul Ritter
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 Moony
-# SPDX-FileCopyrightText: 2023 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2023 metalgearsloth
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Myra
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Cojoke
-# SPDX-FileCopyrightText: 2025 Redrover1760
-# SPDX-FileCopyrightText: 2025 starch
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: Map file schema validator
 on:
   push:
@@ -20,6 +6,10 @@ on:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   yaml-schema-validation:
     name: YAML map schema validator

.github/workflows/yaml-linter.yml

@@ -1,21 +1,3 @@
-# SPDX-FileCopyrightText: 2021 Javier Guardia Fernández
-# SPDX-FileCopyrightText: 2021 Paul Ritter
-# SPDX-FileCopyrightText: 2021 Swept
-# SPDX-FileCopyrightText: 2021 mirrorcult
-# SPDX-FileCopyrightText: 2022 0x6273
-# SPDX-FileCopyrightText: 2023 DrSmugleaf
-# SPDX-FileCopyrightText: 2023 Moony
-# SPDX-FileCopyrightText: 2023 metalgearsloth
-# SPDX-FileCopyrightText: 2024 Checkraze
-# SPDX-FileCopyrightText: 2024 Dvir
-# SPDX-FileCopyrightText: 2024 Myra
-# SPDX-FileCopyrightText: 2025 Coenx-flex
-# SPDX-FileCopyrightText: 2025 Cojoke
-# SPDX-FileCopyrightText: 2025 Pieter-Jan Briers
-# SPDX-FileCopyrightText: 2025 Redrover1760
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
 name: YAML Linter
 
 on:
@@ -25,6 +7,10 @@ on:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: YAML Linter
@@ -44,7 +30,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3.2.0
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

.gitignore

@@ -1,3 +1,6 @@
+# MSbuild binlog files
+*.binlog
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

.reuse/dep5

@@ -1,10 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Monolith
-Upstream-Contact: Ark <circus_tricky406@simplelogin.com>
-Source: https://discord.com/invite/mxY4h2JuUw
-
-# Sample paragraph, commented out:
-#
-# Files: src/*
-# Copyright: $YEAR $NAME <$CONTACT>
-# License: ...

.vscode/launch.json

@@ -13,6 +13,26 @@
             "console": "internalConsole",
             "stopAtEntry": false
         },
+        {
+            "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
+        },
         {
             "name": "Client (Compatibility renderer)",
             "type": "coreclr",
@@ -31,6 +51,26 @@
             "console": "integratedTerminal",
             "stopAtEntry": false
         },
+        {
+            "name": "Server - Tools",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build - Tools",
+            "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
+            "args": [""],
+            "console": "integratedTerminal",
+            "stopAtEntry": false
+        },
+        {
+            "name": "Server - Release",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build - Release",
+            "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
+            "args": [""],
+            "console": "integratedTerminal",
+            "stopAtEntry": false
+        },
         {
             "name": "YAML Linter",
             "type": "coreclr",
@@ -40,7 +80,7 @@
             "cwd": "${workspaceFolder}/Content.YAMLLinter",
             "console": "internalConsole",
             "stopAtEntry": false
-        }
+        },
     ],
     "compounds": [
         {
@@ -51,14 +91,21 @@
             ],
             "preLaunchTask": "build"
         },
-        // Frontier begin
         {
-            "name": "Server/Client (Release)",
+            "name": "Server/Client - Tools",
             "configurations": [
-                "Server",
-                "Client"
+                "Server - Tools",
+                "Client - Tools"
             ],
-            "preLaunchTask": "build-release"
+            "preLaunchTask": "build - Tools"
+        },
+        {
+            "name": "Server/Client - Release",
+            "configurations": [
+                "Server - Release",
+                "Client - Release"
+            ],
+            "preLaunchTask": "build - Release"
         },
         {
             "name": "Server/Client (No Build)",
@@ -67,6 +114,5 @@
                 "Client"
             ]
         }
-        // Frontier end
     ]
 }

.vscode/tasks.json

@@ -21,26 +21,46 @@
             },
             "problemMatcher": "$msCompile"
         },
-        // Frontier begin
         {
-            "label": "build-release",
+            "label": "build - Tools",
             "command": "dotnet",
             "type": "shell",
             "args": [
                 "build",
-                "--configuration=Release", // Build in release mode. Note: --, not /. /configuration doesn't work, because Microsoft.
+                "--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
+                "/consoleloggerparameters:'ForceNoAlign;NoSummary'", // Do not generate summary otherwise it leads to duplicate errors in Problems panel
             ],
             "group": {
-                "kind": "build"
+                "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:'ForceNoAlign;NoSummary'", // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": false
             },
             "presentation": {
                 "reveal": "silent"
             },
             "problemMatcher": "$msCompile"
         },
-        // Frontier end
         {
             "label": "build-yaml-linter",
             "command": "dotnet",

BuildChecker/git_helper.py

@@ -8,7 +8,7 @@ import shutil
 from pathlib import Path
 from typing import List
 
-SOLUTION_PATH = Path("..") / "SpaceStation14.sln"
+SOLUTION_PATH = Path("..") / "SpaceStation14.slnx"
 # If this doesn't match the saved version we overwrite them all.
 CURRENT_HOOKS_VERSION = "2"
 QUIET = len(sys.argv) == 2 and sys.argv[1] == "--quiet"

Content.Benchmarks/ComponentQueryBenchmark.cs

@@ -1,8 +1,3 @@
-// SPDX-FileCopyrightText: 2024 ElectroJr
-// SPDX-FileCopyrightText: 2025 Leon Friedrich
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 #nullable enable
 using System;
 using System.Runtime.CompilerServices;

Content.Benchmarks/Content.Benchmarks.csproj

@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
     <OutputPath>..\bin\Content.Benchmarks\</OutputPath>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>12</LangVersion>
+    <IsTestingPlatformApplication>false</IsTestingPlatformApplication>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
+
+    <!-- pin transitive deps -->
+    <PackageReference Include="System.Management" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Content.Client\Content.Client.csproj" />
@@ -19,10 +22,12 @@
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
     <ProjectReference Include="..\Content.Tests\Content.Tests.csproj" />
     <ProjectReference Include="..\Content.IntegrationTests\Content.IntegrationTests.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Benchmarks\Robust.Benchmarks.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Server\Robust.Server.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Server.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+  <Import Project="..\RobustToolbox\Imports\Benchmarks.props" />
+  <Import Project="..\RobustToolbox\Imports\Testing.props" />
 </Project>

Content.Benchmarks/DynamicTreeBenchmark.cs

@@ -1,13 +1,3 @@
-// SPDX-FileCopyrightText: 2020 DrSmugleaf
-// SPDX-FileCopyrightText: 2020 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2022 Paul Ritter
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2022 wrexbe
-// SPDX-FileCopyrightText: 2023 TemporalOroboros
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using BenchmarkDotNet.Attributes;
 using Robust.Shared.Analyzers;
 using Robust.Shared.Maths;

Content.Benchmarks/GlobalUsings.cs

@@ -0,0 +1,3 @@
+// Global usings for Content.Benchmarks
+
+global using Robust.UnitTesting.Pool;

Content.Benchmarks/Program.cs

@@ -1,11 +1,3 @@
-// SPDX-FileCopyrightText: 2020 Tyler Young
-// SPDX-FileCopyrightText: 2022 Paul Ritter
-// SPDX-FileCopyrightText: 2023 Visne
-// SPDX-FileCopyrightText: 2024 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2025 Leon Friedrich
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System;
 using BenchmarkDotNet.Running;
 using BenchmarkDotNet.Configs;

Content.Benchmarks/RaiseEventBenchmark.cs

@@ -1,7 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Leon Friedrich
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 #nullable enable
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;

Content.Client/Administration/UI/PermissionsEui.cs

@@ -167,6 +167,7 @@ namespace Content.Client.Administration.UI
         {
             var flags = popup.CollectSetFlags();
             var name = popup.NameEdit.Text;
+            var shortName = popup.ShortNameEdit.Text; // Mono
 
             if (popup.SourceId is { } src)
             {
@@ -175,6 +176,7 @@ namespace Content.Client.Administration.UI
                     Id = src,
                     Flags = flags,
                     Name = name,
+                    ShortName = shortName // Mono
                 });
             }
             else
@@ -182,7 +184,8 @@ namespace Content.Client.Administration.UI
                 SendMessage(new AddAdminRank
                 {
                     Flags = flags,
-                    Name = name
+                    Name = name,
+                    ShortName = shortName // Mono
                 });
             }
 
@@ -539,6 +542,7 @@ namespace Content.Client.Administration.UI
         {
             public readonly int? SourceId;
             public readonly LineEdit NameEdit;
+            public readonly LineEdit ShortNameEdit; // Mono
             public readonly Button SaveButton;
             public readonly Button? RemoveButton;
             public readonly Dictionary<AdminFlags, CheckBox> FlagCheckBoxes = new();
@@ -554,9 +558,16 @@ namespace Content.Client.Administration.UI
                     PlaceHolder = Loc.GetString("permissions-eui-edit-admin-rank-window-name-edit-placeholder"),
                 };
 
+                // Mono
+                ShortNameEdit = new LineEdit
+                {
+                    PlaceHolder = Loc.GetString("permissions-eui-edit-admin-rank-window-short-name-edit-placeholder"),
+                };
+
                 if (data != null)
                 {
                     NameEdit.Text = data.Value.Value.Name;
+                    ShortNameEdit.Text = data.Value.Value.ShortName;
                 }
 
                 SaveButton = new Button
@@ -611,6 +622,7 @@ namespace Content.Client.Administration.UI
                     Children =
                     {
                         NameEdit,
+                        ShortNameEdit,
                         flagsBox,
                         bottomButtons
                     }

Content.Client/Alerts/GenericCounterAlertSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Coenx-flex
-// SPDX-FileCopyrightText: 2025 Cojoke
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Numerics;
 using Content.Shared.Alert.Components;
 using Robust.Client.GameObjects;

Content.Client/Alerts/UpdateAlertSpriteEvent.cs

@@ -1,10 +1,3 @@
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2025 Coenx-flex
-// SPDX-FileCopyrightText: 2025 Cojoke
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Alert;
 using Robust.Client.GameObjects;
 

Content.Client/Atmos/AlignAtmosPipeLayers.cs

@@ -1,10 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Construction;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs

@@ -1,10 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Pinpointer.UI;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Pinpointer;

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs

@@ -1,10 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.Consoles;
 using Robust.Shared.GameStates;

Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs

@@ -1,11 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 pathetic meowmeow
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Pinpointer.UI;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Atmos.Components;

Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs

@@ -1,14 +1,3 @@
-// SPDX-FileCopyrightText: 2023 08A
-// SPDX-FileCopyrightText: 2023 Leon Friedrich
-// SPDX-FileCopyrightText: 2023 Visne
-// SPDX-FileCopyrightText: 2024 MilenVolf
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.SubFloor;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;

Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs

@@ -1,10 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Atmos.Components;
 using Content.Shared.Atmos.EntitySystems;
 using Robust.Client.GameObjects;

Content.Client/Atmos/EntitySystems/GasPressureRegulatorSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Atmos.Piping.Binary.Components;
 

Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs

@@ -0,0 +1,253 @@
+using Content.Client.Atmos.EntitySystems;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.EntitySystems;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using System.Numerics;
+
+namespace Content.Client.Atmos.Overlays;
+
+/// <summary>
+/// Renders a thermal heatmap overlay for gas tiles, used for equipment like thermal glasses.
+/// /// </summary>
+public sealed class GasTileDangerousTemperatureOverlay : Overlay
+{
+    public override bool RequestScreenTexture { get; set; } = false;
+
+    [Dependency] private readonly IEntityManager _entManager = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly IClyde _clyde = default!;
+
+    private GasTileOverlaySystem? _gasTileOverlay;
+    private readonly SharedTransformSystem _xformSys;
+    private EntityQuery<GasTileOverlayComponent> _overlayQuery;
+
+    private IRenderTexture? _temperatureTarget;
+
+    // Cache used to transform ThermalByte into Color for overlay
+    private readonly Color[] _colorCache = new Color[256];
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
+
+    public GasTileDangerousTemperatureOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _xformSys = _entManager.System<SharedTransformSystem>();
+
+        _overlayQuery = _entManager.GetEntityQuery<GasTileOverlayComponent>();
+
+        for (byte i = 0; i <= ThermalByte.TempResolution; i++)
+        {
+            _colorCache[i] = PreCalculateColor(i);
+        }
+
+        _colorCache[ThermalByte.StateVacuum] = Color.Teal;
+        _colorCache[ThermalByte.StateVacuum].A = 0.6f;
+        _colorCache[ThermalByte.AtmosImpossible] = Color.Transparent;
+
+#if DEBUG // This shouldn't happend so tell me if you see this LimeGreen on the screen
+        _colorCache[ThermalByte.ReservedFuture0] = Color.LimeGreen;
+        _colorCache[ThermalByte.ReservedFuture1] = Color.LimeGreen;
+        _colorCache[ThermalByte.ReservedFuture2] = Color.LimeGreen;
+#else
+        _colorCache[ThermalByte.ReservedFuture0] = Color.Transparent;
+        _colorCache[ThermalByte.ReservedFuture1] = Color.Transparent;
+        _colorCache[ThermalByte.ReservedFuture2] = Color.Transparent;
+#endif
+    }
+
+
+    /// <summary>
+    /// Used for Calculating onscreen color from ThermalByte core value
+    /// /// </summary>
+    private static Color PreCalculateColor(byte byteTemp)
+    {
+        // Color Thresholds in Kelvin
+        // -150 C
+        const float deepFreezeK = 123.15f;
+        // -50 C
+        const float freezeStartK = 223.15f;
+        // 0 C
+        const float waterFreezeK = 273.15f;
+        // 50 C
+        const float heatStartK = 323.15f;
+        // 100 C
+        const float waterBoilK = 373.15f;
+        // 300 C
+        const float superHeatK = 573.15f;
+
+        var tempK = byteTemp * ThermalByte.TempDegreeResolution;
+
+        // Neutral Zone Check (0C to 50C)
+        // If between 273.15K and 323.15K, it's transparent.
+        if (tempK >= waterFreezeK && tempK < heatStartK)
+        {
+            return Color.Transparent;
+        }
+
+        Color resultingColor;
+
+        switch (tempK)
+        {
+            case < deepFreezeK:
+                resultingColor = Color.FromHex("#330066");
+                resultingColor.A = 0.7f;
+                break;
+            case < freezeStartK:
+                // Interpolate Deep Purple -> Blue
+                // Range: 123.15 to 223.15 (Span: 100)
+                resultingColor = Color.InterpolateBetween(
+                    Color.FromHex("#330066"),
+                    Color.Blue,
+                    (tempK - deepFreezeK) * 0.01f);
+                resultingColor.A = 0.6f;
+                break;
+            case < waterFreezeK:
+                // Interpolate Blue -> Transparent
+                // Range: 223.15 to 273.15 (Span: 50)
+
+                resultingColor = Color.InterpolateBetween(
+                    new Color(Color.Blue.R, Color.Blue.G, Color.Blue.B, 0.6f),
+                    new Color(Color.Blue.R, Color.Blue.G, Color.Blue.B, 0.2f),
+                    (tempK - freezeStartK) * 0.02f);
+                break;
+            case < waterBoilK:
+                // Interpolate Transparent -> Yellow
+                // Range: 323.15 to 373.15 (Span: 50)
+
+                resultingColor = Color.InterpolateBetween(
+                    new Color(Color.Yellow.R, Color.Yellow.G, Color.Yellow.B, 0.2f),
+                    new Color(Color.Yellow.R, Color.Yellow.G, Color.Yellow.B, 0.6f),
+                    (tempK - heatStartK) * 0.02f);
+                break;
+            case < superHeatK:
+                // Interpolate Yellow -> Red
+                // Range: 373.15 to 573.15 (Span: 200)
+                resultingColor = Color.InterpolateBetween(
+                    Color.Yellow,
+                    Color.Red,
+                    (tempK - waterBoilK) * 0.005f);
+                resultingColor.A = 0.6f;
+                break;
+            default:
+                resultingColor = Color.DarkRed;
+                resultingColor.A = 0.7f;
+                break;
+        }
+
+        return resultingColor;
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (args.MapId == MapId.Nullspace)
+            return false;
+
+        _gasTileOverlay ??= _entManager.System<GasTileOverlaySystem>();
+        if (_gasTileOverlay == null)
+            return false;
+
+        var target = args.Viewport.RenderTarget;
+
+        if (_temperatureTarget?.Texture.Size != target.Size)
+        {
+            _temperatureTarget?.Dispose();
+            _temperatureTarget = _clyde.CreateRenderTarget(
+                target.Size,
+                new RenderTargetFormatParameters(RenderTargetColorFormat.Rgba8Srgb),
+                name: nameof(GasTileDangerousTemperatureOverlay));
+        }
+
+        var drawHandle = args.WorldHandle;
+        var worldBounds = args.WorldBounds;
+        var worldAABB = args.WorldAABB;
+        var mapId = args.MapId;
+        var worldToViewportLocal = args.Viewport.GetWorldToLocalMatrix();
+
+        var anyGasDrawn = false;
+        List<Entity<MapGridComponent>> grids = new();
+
+        drawHandle.RenderInRenderTarget(_temperatureTarget,
+            () =>
+            {
+                grids.Clear();
+                _mapManager.FindGridsIntersecting(mapId, worldAABB, ref grids);
+
+                foreach (var grid in grids)
+                {
+                    if (!_overlayQuery.TryGetComponent(grid.Owner, out var comp))
+                        continue;
+
+                    var gridTileSizeVec = grid.Comp.TileSizeVector;
+                    var gridTileCenterVec = grid.Comp.TileSizeHalfVector;
+                    var gridEntToWorld = _xformSys.GetWorldMatrix(grid.Owner);
+                    var gridEntToViewportLocal = gridEntToWorld * worldToViewportLocal;
+
+                    drawHandle.SetTransform(gridEntToViewportLocal);
+
+                    var worldToGridLocal = _xformSys.GetInvWorldMatrix(grid.Owner);
+                    var floatBounds = worldToGridLocal.TransformBox(worldBounds).Enlarged(grid.Comp.TileSize);
+
+                    var localBounds = new Box2i(
+                        (int)MathF.Floor(floatBounds.Left),
+                        (int)MathF.Floor(floatBounds.Bottom),
+                        (int)MathF.Ceiling(floatBounds.Right),
+                        (int)MathF.Ceiling(floatBounds.Top));
+
+                    foreach (var chunk in comp.Chunks.Values)
+                    {
+                        var enumerator = new GasChunkEnumerator(chunk);
+                        while (enumerator.MoveNext(out var tileGas))
+                        {
+                            var tilePosition = chunk.Origin + (enumerator.X, enumerator.Y);
+                            if (!localBounds.Contains(tilePosition))
+                                continue;
+
+                            var gasColor = _colorCache[tileGas.ByteGasTemperature.Value];
+
+                            if (gasColor.A <= 0f)
+                                continue;
+
+                            anyGasDrawn = true;
+
+                            drawHandle.DrawRect(
+                                Box2.CenteredAround(tilePosition + gridTileCenterVec, gridTileSizeVec),
+                                gasColor
+                            );
+                        }
+                    }
+                }
+            },
+            new Color(0, 0, 0, 0));
+
+        drawHandle.SetTransform(Matrix3x2.Identity);
+
+        if (!anyGasDrawn)
+        {
+            _temperatureTarget?.Dispose();
+            _temperatureTarget = null;
+            return false;
+        }
+
+        return true;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (_temperatureTarget is null)
+            return;
+
+        args.WorldHandle.DrawTextureRect(_temperatureTarget.Texture, args.WorldBounds);
+        args.WorldHandle.SetTransform(Matrix3x2.Identity);
+    }
+
+    protected override void DisposeBehavior()
+    {
+        _temperatureTarget?.Dispose();
+        _temperatureTarget = null;
+        base.DisposeBehavior();
+    }
+}

Content.Client/Atmos/Overlays/GasTileOverlay.cs

@@ -1,23 +1,3 @@
-// SPDX-FileCopyrightText: 2020 Metal Gear Sloth
-// SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto
-// SPDX-FileCopyrightText: 2021 E F R
-// SPDX-FileCopyrightText: 2021 GraniteSidewalk
-// SPDX-FileCopyrightText: 2021 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto
-// SPDX-FileCopyrightText: 2022 Acruid
-// SPDX-FileCopyrightText: 2022 DrSmugleaf
-// SPDX-FileCopyrightText: 2022 hubismal
-// SPDX-FileCopyrightText: 2022 metalgearsloth
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2023 Visne
-// SPDX-FileCopyrightText: 2023 Ygg01
-// SPDX-FileCopyrightText: 2024 Leon Friedrich
-// SPDX-FileCopyrightText: 2024 eoineoineoin
-// SPDX-FileCopyrightText: 2025 TemporalOroboros
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Numerics;
 using Content.Client.Atmos.Components;
 using Content.Client.Atmos.EntitySystems;

Content.Client/Atmos/UI/GasAnalyzerWindow.xaml.cs

@@ -1,16 +1,3 @@
-// SPDX-FileCopyrightText: 2022 theashtronaut
-// SPDX-FileCopyrightText: 2023 Nemanja
-// SPDX-FileCopyrightText: 2023 metalgearsloth
-// SPDX-FileCopyrightText: 2023 qwerltaz
-// SPDX-FileCopyrightText: 2024 Mervill
-// SPDX-FileCopyrightText: 2024 slarticodefast
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Numerics;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Atmos;

Content.Client/Atmos/UI/GasCanisterWindow.xaml.cs

@@ -1,12 +1,3 @@
-// SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto
-// SPDX-FileCopyrightText: 2022 Leon Friedrich
-// SPDX-FileCopyrightText: 2022 Paul Ritter
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2022 wrexbe
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;

Content.Client/Atmos/UI/GasFilterBoundUserInterface.cs

@@ -1,19 +1,3 @@
-// SPDX-FileCopyrightText: 2021 ike709
-// SPDX-FileCopyrightText: 2022 Leon Friedrich
-// SPDX-FileCopyrightText: 2022 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2022 Vordenburg
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2023 TemporalOroboros
-// SPDX-FileCopyrightText: 2023 Tom Leys
-// SPDX-FileCopyrightText: 2023 deltanedas
-// SPDX-FileCopyrightText: 2023 metalgearsloth
-// SPDX-FileCopyrightText: 2024 Kot
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2025 Steve
-// SPDX-FileCopyrightText: 2025 bitcrushing
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Atmos.EntitySystems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping.Trinary.Components;

Content.Client/Atmos/UI/GasFilterWindow.xaml.cs

@@ -1,19 +1,3 @@
-// SPDX-FileCopyrightText: 2021 ike709
-// SPDX-FileCopyrightText: 2022 Paul Ritter
-// SPDX-FileCopyrightText: 2022 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2022 Vordenburg
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2022 wrexbe
-// SPDX-FileCopyrightText: 2023 Visne
-// SPDX-FileCopyrightText: 2024 Kot
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2024 metalgearsloth
-// SPDX-FileCopyrightText: 2025 Steve
-// SPDX-FileCopyrightText: 2025 bitcrushing
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;

Content.Client/Atmos/UI/GasPressureRegulatorBoundUserInterface.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Localizations;

Content.Client/Atmos/UI/GasPressureRegulatorWindow.xaml.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Globalization;
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;

Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs

@@ -1,26 +1,31 @@
 using System.Linq;
 using Content.Client.Gameplay;
+using Content.Shared._Crescent.SpaceBiomes;
 using Content.Shared.Audio;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
-using Content.Shared.Random;
-using Content.Shared.Random.Rules;
-using Robust.Client.GameObjects;
+using Content.Client._Crescent.SpaceBiomes;
 using Robust.Client.Player;
-using Robust.Client.ResourceManagement;
 using Robust.Client.State;
 using Robust.Shared.Audio;
-using Robust.Shared.Audio.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Content.Client.CombatMode;
+using Content.Shared.CombatMode;
 using Robust.Shared.Timing;
-using Robust.Shared.Utility;
+using Content.Shared.NPC.Components;
+using Content.Shared._Mono.CCVar;
+using Content.Shared._Crescent.Vessel;
+using Content.Shared.Ghost;
 
 namespace Content.Client.Audio;
 
+/// <summary>
+/// This handles playing ambient music over time, and combat music per faction.
+/// </summary>
 public sealed partial class ContentAudioSystem
 {
     [Dependency] private readonly IConfigurationManager _configManager = default!;
@@ -29,60 +34,493 @@ public sealed partial class ContentAudioSystem
     [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IStateManager _state = default!;
-    [Dependency] private readonly RulesSystem _rules = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly CombatModeSystem _combatModeSystem = default!; //CLIENT ONE. WHY ARE THERE 3???
 
-    private readonly TimeSpan _minAmbienceTime = TimeSpan.FromSeconds(30);
-    private readonly TimeSpan _maxAmbienceTime = TimeSpan.FromSeconds(60);
+    //options menu ---
+    private static float _volumeSliderAmbient;
+    private static float _volumeSliderCombat;
+    private static bool _combatMusicToggle;
+    //options menu ---
 
-    private const float AmbientMusicFadeTime = 10f;
-    private static float _volumeSlider;
-
-    // Don't need to worry about this being serializable or pauseable as it doesn't affect the sim.
-    private TimeSpan _nextAudio;
+    private const string NpcFactionPDV = "PirateNF"; //we should really fucking change these on monolith. wtf
+    private const string NpcFactionTSFMC = "TSFMC";
 
+    // This stores the music stream. It's used to start/stop the music on the fly.
     private EntityUid? _ambientMusicStream;
+
+    // This stores the ambient music prototype to be played next.
     private AmbientMusicPrototype? _musicProto;
 
-    /// <summary>
-    /// If we find a better ambient music proto can we interrupt this one.
-    /// </summary>
-    private bool _interruptable;
+    // Time to wait in between replaying ambient music tracks. Should be at least 1-2 seconds to prevent possible overlapping.
+    private float _timeUntilNextAmbientTrack = 1;
 
-    /// <summary>
-    /// Track what ambient sounds we've played. This is so they all get played an even
-    /// number of times.
-    /// When we get to the end of the list we'll re-shuffle
-    /// </summary>
-    private readonly Dictionary<string, List<ResPath>> _ambientSounds = new();
+    // List of available ambient music tracks to sift through.
+    private List<AmbientMusicPrototype>? _musicTracks;
 
-    private ISawmill _sawmill = default!;
+    // Time in seconds for ambient music tracks to fade in. Set to 0 to play immediately.
+    private float _ambientMusicFadeInTime = 10f;
+
+    // Time in seconds for combat music tracks to fade in. Set to 0 to play immediately.
+    private float _combatMusicFadeInTime = 2f;
+
+    // Time that combat mode needs to be on to start playing music. Set to 0 to play immediately.
+    private float _combatMusicTimeToStart;
+
+    // Time that combat mode needs to be off to stop combat mode. Set to 0 to turn off as soon as combat mode is off.
+    private float _combatMusicTimeToEnd;
+
+    // Combat mode state before checking to switch combat music off/on.
+    // 1. We toggle combat mode. We fire SwitchCombatMusic in (timer) seconds.
+    // 2. We save the state from step 1 in _lastCombatState
+    // 3. When SwitchCombatMusic fires, we check if the current combat state is different than _lastCombatState. If it is, then we change music. If not, we keep it.
+    private bool _lastCombatState = false;
+
+    private ProtoId<SpaceBiomePrototype>? _lastBiome;
+    private EntityUid? _lastGrid;
+
+    private enum MusicType : byte //used to deal with edgecases of when music should not be overridden
+    {
+        None = 0,
+        Biome = 1,
+        Grid = 2,
+        Combat = 3
+    }
+    private MusicType? _currentlyPlaying = MusicType.None;
+
+    // really stupid - i need this to check if the volume changes when you change the options menu options.
+    private bool _isCombatMusicPlaying = false;
+
+    private float _replayAmbientMusicTimer = 0;
+    private bool _replayAmbientMusicBool;
+    private float _combatWindUpTimer = 0;
+    private bool _combatWindUpBool = false;
+    private float _combatWindDownTimer = 0;
+    private bool _combatWindDownBool = false;
+
+
+    // ok so - the parent change for the station happens too early and something fucks up
+    // so the music system plays the music but you can't hear it. this is for OnPlayerSpawn to set the replayambientmusictimer to replay it, which fixes it
+    // its hacky, but itll do for now. inb4 this line is still here 2 years later
+    private const float InitialStationMusicTimeToDrop = 5f;
+    private float _initialStationMusicTimer = 0f;
+    private bool _initialStationMusicBool = false;
+    private ISawmill _sawmill = default!; //lobbymusic.cs has a sawmill call so i can't remove this????
+
+    private ProtoId<SpaceBiomePrototype> _defaultBiomeProto = "BiomeDefault"; //which biome proto is the fallback for null?
+
+    public void UpdateAmbientMusic(float frameTime)
+    {
+        base.Update(frameTime);
+
+        if (!_timing.IsFirstTimePredicted) //otherwise this will tick like 5x faster on client. thanks prediction
+            return;
+
+        if (_initialStationMusicBool)
+        {
+            _initialStationMusicTimer += frameTime;
+            if (_replayAmbientMusicTimer > InitialStationMusicTimeToDrop)
+            {
+                ReplayAmbientMusic();
+                _initialStationMusicBool = false;
+                _initialStationMusicTimer = 0;
+                _replayAmbientMusicTimer = 0;
+            }
+        }
+        if (_replayAmbientMusicBool)
+        {
+            _replayAmbientMusicTimer += frameTime;
+            if (_replayAmbientMusicTimer > _timeUntilNextAmbientTrack)
+            {
+                ReplayAmbientMusic();
+                _replayAmbientMusicTimer = 0;
+            }
+        }
+        if (_combatWindUpBool)
+        {
+            _combatWindUpTimer += frameTime;
+            if (_combatWindUpTimer > _combatMusicTimeToStart)
+            {
+                SwitchCombatMusic(true);
+                _combatWindUpBool = false;
+                _combatWindUpTimer = 0;
+            }
+        }
+        if (_combatWindDownBool)
+        {
+            _combatWindDownTimer += frameTime;
+            if (_combatWindDownTimer > _combatMusicTimeToEnd)
+            {
+                SwitchCombatMusic(false);
+                _combatWindDownBool = false;
+                _combatWindDownTimer = 0;
+            }
+        }
+    }
 
     private void InitializeAmbientMusic()
     {
+        SubscribeLocalEvent<SpaceBiomeSwapMessage>(OnBiomeChange);
+        SubscribeLocalEvent<PlayerParentChangedMessage>(OnPlayerParentChange);
+        SubscribeLocalEvent<ToggleCombatActionEvent>(OnCombatModeToggle);
+
+        SubscribeLocalEvent<LocalPlayerDetachedEvent>(OnPlayerDetach); //in case u die in combatmode
+
+        SubscribeLocalEvent<LocalPlayerAttachedEvent>(OnPlayerSpawn);
+
         Subs.CVar(_configManager, CCVars.AmbientMusicVolume, AmbienceCVarChanged, true);
-        _sawmill = IoCManager.Resolve<ILogManager>().GetSawmill("audio.ambience");
+        Subs.CVar(_configManager, MonoCVars.CombatMusicVolume, CombatCVarChanged, true);
+        Subs.CVar(_configManager, MonoCVars.CombatMusicEnabled, CombatToggleChanged, true);
+        Subs.CVar(_configManager, MonoCVars.CombatMusicWindUpTime, CombatWindUpChanged, true);
+        Subs.CVar(_configManager, MonoCVars.CombatMusicWindDownTime, CombatWindDownChanged, true);
 
-        // Reset audio
-        _nextAudio = TimeSpan.MaxValue;
+        // Setup tracks to pull from. Runs once.
+        _musicTracks = GetTracks();
+
+
+        //no longer needed because we track my the current audio track's time
+        //Timer.Spawn(_timeUntilNextAmbientTrack, () => ReplayAmbientMusic());
 
-        SetupAmbientSounds();
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnProtoReload);
         _state.OnStateChanged += OnStateChange;
         // On round end summary OR lobby cut audio.
         SubscribeNetworkEvent<RoundEndMessageEvent>(OnRoundEndMessage);
     }
 
+    /// <summary>
+    /// Tracks player spawning in to replay ambient music 5 seconds in, making sure station music plays.
+    /// Currently, there is a bug that I can't fix, where after spawning in, station music won't kick in despite the PlayMusic function firing.
+    /// </summary>
+    /// <param name="ev"></param>
+    private void OnPlayerSpawn(LocalPlayerAttachedEvent ev)
+    {
+        _initialStationMusicBool = true;
+        _initialStationMusicTimer = 0f;
+
+    }
+
+
+    /// <summary>
+    /// This makes sure that combatmode turns OFF when u ghost, or when ur in aghost and return to ur character.
+    /// </summary>
+    /// <param name="ev"></param>
+    private void OnPlayerDetach(LocalPlayerDetachedEvent ev)
+    {
+        SetMusic(_lastGrid, _lastBiome, false);
+    }
+
+
+    /// <summary>
+    /// Helper function to replay ambient music after it's done.
+    /// </summary>
+    private void ReplayAmbientMusic()
+    {
+        if (_musicProto == null) //if we don't find any, we play the default track.
+        {
+            _musicProto = _proto.Index<AmbientMusicPrototype>(_defaultBiomeProto);
+            _lastBiome = _proto.Index<SpaceBiomePrototype>(_defaultBiomeProto);
+        }
+
+        SoundCollectionPrototype soundcol = _proto.Index<SoundCollectionPrototype>(_musicProto.ID);
+
+        string path = _random.Pick(soundcol.PickFiles).ToString(); //picks a random track. if someone really cared we could make it make sure it doesnt play the same track twice
+
+        PlayMusicTrack(path, _musicProto.Sound.Params.Volume, _ambientMusicFadeInTime, false);
+    }
+
+    private void OnBiomeChange(ref SpaceBiomeSwapMessage ev)
+    {
+        SetMusic(_lastGrid, ev.Id, _lastCombatState);
+    }
+    private void OnPlayerParentChange(ref PlayerParentChangedMessage ev)
+    {
+        SetMusic(ev.Grid, _lastBiome, _lastCombatState);
+    }
+    private void SwitchCombatMusic(bool currentCombatState)
+    {
+        SetMusic(_lastGrid, _lastBiome, currentCombatState);
+    }
+    private void OnCombatModeToggle(ToggleCombatActionEvent ev)
+    {
+        if (_combatMusicToggle == false) // if cvar is off, don't bother
+            return;
+        if (!_timing.IsFirstTimePredicted == true) //needed, because combat mode is predicted, and triggers 7 times otherwise.
+            return;
+        bool currentCombatState = _combatModeSystem.IsInCombatMode();
+        if (currentCombatState) //if combat mode is being turned ON
+        {
+            _combatWindUpBool = true;
+            _combatWindUpTimer = 0;
+            _combatWindDownBool = false;
+            _combatWindDownTimer = 0;
+        }
+        else //if combat mode is being turned OFF
+        {
+            _combatWindDownBool = true;
+            _combatWindDownTimer = 0;
+            _combatWindUpBool = false;
+            _combatWindUpTimer = 0;
+        }
+    }
+
+    /// <summary>
+    /// Function that takes in data from requests to change music and determines what music to play / if it should play it.
+    /// </summary>
+    /// <param name="newGrid"></param>
+    /// <param name="newBiome"></param>
+    /// <param name="newCombatState"></param>
+    private void SetMusic(EntityUid? newGrid, ProtoId<SpaceBiomePrototype>? newBiome, bool newCombatState)
+    {
+        //Log.Info("SETMUSIC: - GRID: " + newGrid.ToString() + " BIOME: " + newBiome.ToString() + " COMBAT: " + newCombatState.ToString());
+        // priority list:
+        // 1. (not implemented yet :godo:) ship combat music
+        // 2. combat music
+        // 3. grid music
+        // 4. biome music
+        // therefore we check these top 2 bottom
+
+        #region combat music
+        if (newCombatState != _lastCombatState) //we switch combat music on or off now
+        {
+            _lastCombatState = newCombatState; // cache combat state since its different than the last
+            if (newCombatState) //true = we toggled combat ON.
+            {
+                // figure out the faction we should play combat music for
+                string factionComponentString = "";
+                if (TryComp<NpcFactionMemberComponent>(_player.LocalEntity, out NpcFactionMemberComponent? factionComp))
+                    factionComponentString = factionComp.Factions.FirstOrDefault("");
+                string combatFactionSuffix; //this is added to "combatmode" to create "combatmodePDV", etc, to fetch combat tracks.
+                switch (factionComponentString) //this will hardcode the valid factions but until someone cleans up the frontier tags this looks way nicer
+                {
+                    case NpcFactionPDV:
+                        combatFactionSuffix = "PDV";
+                        break;
+                    case NpcFactionTSFMC:
+                        combatFactionSuffix = "TSFMC";
+                        break;
+                    default:
+                        combatFactionSuffix = "Default";
+                        break;
+                }
+
+                // if we find a ambient music prototype for our faction, then pick that one!
+                if (_proto.TryIndex<AmbientMusicPrototype>("CombatMode" + combatFactionSuffix, out var factionCombatMusicPrototype))
+                    _musicProto = factionCombatMusicPrototype;
+                else //if we don't ,set it to the default
+                    _musicProto = _proto.Index<AmbientMusicPrototype>("CombatModeDefault");
+
+                _currentlyPlaying = MusicType.Combat;
+
+                SoundCollectionPrototype soundcol = _proto.Index<SoundCollectionPrototype>(_musicProto.ID);
+                string path = _random.Pick(soundcol.PickFiles).ToString();
+                PlayMusicTrack(path, _musicProto.Sound.Params.Volume, _combatMusicFadeInTime, true);
+                return;
+            }
+            else
+            {
+                //false = we toggled combat OFF, therefore we should play music from our other data we have in this current request.
+                // the easiest way to do this is to set lastgrid & lastbiome to null.
+                _currentlyPlaying = MusicType.None;
+                _lastBiome = null;
+                _lastGrid = null;
+            }
+        }
+        #endregion
+
+        if (_currentlyPlaying >= MusicType.Combat) //if we are in combatmode, we still want to cache info, but we want to return here so that we dont stop playing combatmode music
+        {
+            _lastGrid = newGrid;
+            _lastBiome = newBiome;
+            return;
+        }
+
+        #region grid music
+
+        if (newGrid != _lastGrid || _currentlyPlaying != MusicType.Grid)
+        {
+            if (newGrid != null && TryComp<VesselMusicComponent>(newGrid, out var music)) //do we have grid music? also this gives false if null
+            {
+                _lastGrid = newGrid;
+                _lastBiome = newBiome;
+                _currentlyPlaying = MusicType.Grid;
+
+                _musicProto = _proto.Index<AmbientMusicPrototype>(music.AmbientMusicPrototype);
+                SoundCollectionPrototype soundcol = _proto.Index<SoundCollectionPrototype>(_musicProto.ID);
+                string path = _random.Pick(soundcol.PickFiles).ToString();
+                PlayMusicTrack(path, _musicProto.Sound.Params.Volume, _ambientMusicFadeInTime, false);
+                return;
+            }
+            else
+            {
+                // pass onto next
+            }
+        }
+        else
+        {
+            _lastGrid = newGrid;
+            _lastBiome = newBiome;
+            return;
+        }
+
+        #endregion
+        #region biome music
+
+        if (_lastBiome != newBiome || _currentlyPlaying != MusicType.Biome) //if newBiome is null, we go to fallback
+        {
+            if (newBiome == null)
+            {
+                _musicProto = _proto.Index<AmbientMusicPrototype>(_defaultBiomeProto);
+            }
+            else
+            {
+                if (_musicTracks == null) // if this is null we have way bigger issues
+                    return;
+                _musicProto = null;
+                //else
+                foreach (var ambient in _musicTracks)
+                {
+                    if (newBiome.Value.Id == ambient.ID) //if we find the biome that's matching an ambientMusic prototype's ID, we play that set.
+                    {
+                        _musicProto = ambient;
+                        break;
+                    }
+                }
+                if (_musicProto == null) //if we don't find any ambient music matching our current biome in _musicTracks, we play the fallback track.
+                {
+                    _musicProto = _proto.Index<AmbientMusicPrototype>(_defaultBiomeProto);
+                }
+            }
+
+            _lastBiome = newBiome; // update cache
+            _lastGrid = newGrid;
+            _currentlyPlaying = MusicType.Biome;
+
+            SoundCollectionPrototype soundcol = _proto.Index<SoundCollectionPrototype>(_musicProto.ID);
+            string path = _random.Pick(soundcol.PickFiles).ToString();
+            PlayMusicTrack(path, _musicProto.Sound.Params.Volume, _ambientMusicFadeInTime, false);
+            return;
+        }
+        else
+        {
+            _lastGrid = newGrid;
+            _lastBiome = newBiome;
+            return;
+        }
+
+        #endregion
+    }
+
+
+    /// <summary>
+    /// Helper function that sets up parameters, audio stream, fadein, and music volume.
+    /// </summary>
+    /// <param name="path"> Path to music to play.</param>
+    /// <param name="volume"> Volume modifier (put 0 to keep original volume).</param>
+    /// <param name="fadein"> Seconds for the music to fade in. Put 0 for no fadein. </param>
+    private void PlayMusicTrack(string path, float volume, float fadein, bool combatMode)
+    {
+        _isCombatMusicPlaying = combatMode;
+        FadeOut(_ambientMusicStream);
+
+        if (combatMode)
+        {
+            volume += _volumeSliderCombat;
+            _replayAmbientMusicBool = false;
+        }
+        else
+        {
+            volume += _volumeSliderAmbient;
+            _replayAmbientMusicBool = true;
+        }
+
+        var strim = _audio.PlayGlobal(
+            path,
+            Filter.Local(),
+            false,
+            AudioParams.Default.WithVolume(volume))!;
+
+        _ambientMusicStream = strim.Value.Entity; //this plays it immediately, but fadein function later makes it actually fade in.
+
+        if (fadein != 0)
+            FadeIn(_ambientMusicStream, strim.Value.Component, fadein);
+
+        _timeUntilNextAmbientTrack = (float)_audio.GetAudioLength(path).TotalSeconds;
+    }
+
+    /// <summary>
+    /// Helper function that fetches music tracks to set up the list to pull from on initialize.
+    /// </summary>
+    /// <returns></returns>
+    /// <exception cref="NullReferenceException"></exception>
+    private List<AmbientMusicPrototype> GetTracks()
+    {
+        List<AmbientMusicPrototype> musictracks = new List<AmbientMusicPrototype>();
+
+        bool fallback = true;
+        foreach (var ambience in _proto.EnumeratePrototypes<AmbientMusicPrototype>())
+        {
+            musictracks.Add(ambience);
+            fallback = false;
+        }
+
+        if (fallback) //if we somehow FOUND NO MUSIC TRACKS
+        {
+            throw new NullReferenceException("found no music tracks defined");
+        }
+
+        return musictracks;
+    }
     private void AmbienceCVarChanged(float obj)
     {
-        _volumeSlider = SharedAudioSystem.GainToVolume(obj);
+        _volumeSliderAmbient = SharedAudioSystem.GainToVolume(obj);
 
-        if (_ambientMusicStream != null && _musicProto != null)
+        //this changes the music volume live, while the music is playing. otherwise, the line above that changes the slider is the one that matters.
+
+        if (_ambientMusicStream != null && _musicProto != null && !_isCombatMusicPlaying)
         {
-            _audio.SetVolume(_ambientMusicStream, _musicProto.Sound.Params.Volume + _volumeSlider);
+            _audio.SetVolume(_ambientMusicStream, _musicProto.Sound.Params.Volume + _volumeSliderAmbient);
         }
     }
 
+    private void CombatCVarChanged(float obj)
+    {
+        _volumeSliderCombat = SharedAudioSystem.GainToVolume(obj);
+
+        //this changes the music volume live, while the music is playing. otherwise, the line above that changes the slider is the one that matters.
+
+        if (_ambientMusicStream != null && _musicProto != null && _isCombatMusicPlaying)
+        {
+            _audio.SetVolume(_ambientMusicStream, _musicProto.Sound.Params.Volume + _volumeSliderCombat);
+        }
+    }
+    private void CombatWindUpChanged(int obj)
+    {
+        _combatMusicTimeToStart = obj;
+    }
+    private void CombatWindDownChanged(int obj)
+    {
+        _combatMusicTimeToEnd = obj;
+    }
+
+    /// <summary>
+    /// Handles the combat mode music cvar being toggled on/off.
+    /// </summary>
+    /// <param name="obj"></param>
+    private void CombatToggleChanged(bool obj)
+    {
+        _combatMusicToggle = obj;
+
+        if (_combatMusicToggle) // if the player turned combat music back ON, then we don't really care anymore and the system works as usual
+            return;
+        if (_state.CurrentState is not GameplayState)
+            return; //catches this throwing a null reference exception if u had this cvar toggled, in lobby
+                    //cuz this next setmusic plays music. and well. we havent collected the music yet when we join in
+                    //and we dont need to change music if we're not ingame anyway
+
+        //otherwise we should kill combat music thats playing rn if they turned it off, otherwise it gets STUCK on.
+        SetMusic(_lastGrid, _lastBiome, false);
+    }
+
     private void ShutdownAmbientMusic()
     {
         _state.OnStateChanged -= OnStateChange;
@@ -91,176 +529,36 @@ public sealed partial class ContentAudioSystem
 
     private void OnProtoReload(PrototypesReloadedEventArgs obj)
     {
-        if (obj.WasModified<AmbientMusicPrototype>() || obj.WasModified<RulesPrototype>())
-            SetupAmbientSounds();
+        if (obj.WasModified<AmbientMusicPrototype>())
+            _musicTracks = GetTracks();
     }
-
+    ///<summary>
+    /// This function handles the change from lobby to gameplay, disabling music when you're not in gameplay state.
+    ///</summary>
     private void OnStateChange(StateChangedEventArgs obj)
     {
         if (obj.NewState is not GameplayState)
-            return;
-
-        // If they go to game then reset the ambience timer.
-        _nextAudio = _timing.CurTime + _random.Next(_minAmbienceTime, _maxAmbienceTime);
-    }
-
-    private void SetupAmbientSounds()
-    {
-        _ambientSounds.Clear();
-        foreach (var ambience in _proto.EnumeratePrototypes<AmbientMusicPrototype>())
-        {
-            var tracks = _ambientSounds.GetOrNew(ambience.ID);
-            RefreshTracks(ambience.Sound, tracks, null);
-            _random.Shuffle(tracks);
-        }
+            DisableAmbientMusic();
     }
 
     private void OnRoundEndMessage(RoundEndMessageEvent ev)
     {
+        if (_ambientMusicStream == null)
+        {
+            //_sawmill.Debug("AMBIENT MUSIC STREAM WAS NULL? FROM OnRoundEndMessage()");
+            return;
+        }
         // If scoreboard shows then just stop the music
         _ambientMusicStream = _audio.Stop(_ambientMusicStream);
-        _nextAudio = TimeSpan.FromMinutes(3);
     }
-
-    private void RefreshTracks(SoundSpecifier sound, List<ResPath> tracks, ResPath? lastPlayed)
-    {
-        DebugTools.Assert(tracks.Count == 0);
-
-        switch (sound)
-        {
-            case SoundCollectionSpecifier collection:
-                if (collection.Collection == null)
-                    break;
-
-                var slothCud = _proto.Index<SoundCollectionPrototype>(collection.Collection);
-                tracks.AddRange(slothCud.PickFiles);
-                break;
-            case SoundPathSpecifier path:
-                tracks.Add(path.Path);
-                break;
-        }
-
-        // Just so the same track doesn't play twice
-        if (tracks.Count > 1 && tracks[^1] == lastPlayed)
-        {
-            (tracks[0], tracks[^1]) = (tracks[^1], tracks[0]);
-        }
-    }
-
-    private void UpdateAmbientMusic()
-    {
-        // Update still runs in lobby so just ignore it.
-        if (_state.CurrentState is not GameplayState)
-        {
-            _ambientMusicStream = Audio.Stop(_ambientMusicStream);
-            _musicProto = null;
-            return;
-        }
-
-        bool? isDone = null;
-
-        if (TryComp(_ambientMusicStream, out AudioComponent? audioComp))
-        {
-            isDone = !audioComp.Playing;
-        }
-
-        if (_interruptable)
-        {
-            var player = _player.LocalSession?.AttachedEntity;
-
-            if (player == null || _musicProto == null || !_rules.IsTrue(player.Value, _proto.Index<RulesPrototype>(_musicProto.Rules)))
-            {
-                FadeOut(_ambientMusicStream, duration: AmbientMusicFadeTime);
-                _musicProto = null;
-                _interruptable = false;
-                isDone = true;
-            }
-        }
-
-        // Still running existing ambience
-        if (isDone == false)
-            return;
-
-        // If ambience finished reset the CD (this also means if we have long ambience it won't clip)
-        if (isDone == true)
-        {
-            // Also don't need to worry about rounding here as it doesn't affect the sim
-            _nextAudio = _timing.CurTime + _random.Next(_minAmbienceTime, _maxAmbienceTime);
-        }
-
-        _ambientMusicStream = null;
-
-        if (_nextAudio > _timing.CurTime)
-            return;
-
-        _musicProto = GetAmbience();
-
-        if (_musicProto == null)
-        {
-            _interruptable = false;
-            return;
-        }
-
-        _interruptable = _musicProto.Interruptable;
-        var tracks = _ambientSounds[_musicProto.ID];
-
-        var track = tracks[^1];
-        tracks.RemoveAt(tracks.Count - 1);
-
-        var strim = _audio.PlayGlobal(
-            track.ToString(),
-            Filter.Local(),
-            false,
-            AudioParams.Default.WithVolume(_musicProto.Sound.Params.Volume + _volumeSlider));
-
-        _ambientMusicStream = strim?.Entity;
-
-        if (_musicProto.FadeIn && strim != null)
-        {
-            FadeIn(_ambientMusicStream, strim.Value.Component, AmbientMusicFadeTime);
-        }
-
-        // Refresh the list
-        if (tracks.Count == 0)
-        {
-            RefreshTracks(_musicProto.Sound, tracks, track);
-        }
-    }
-
-    private AmbientMusicPrototype? GetAmbience()
-    {
-        var player = _player.LocalEntity;
-
-        if (player == null)
-            return null;
-
-        var ev = new PlayAmbientMusicEvent();
-        RaiseLocalEvent(ref ev);
-
-        if (ev.Cancelled)
-            return null;
-
-        var ambiences = _proto.EnumeratePrototypes<AmbientMusicPrototype>().ToList();
-        ambiences.Sort((x, y) => y.Priority.CompareTo(x.Priority));
-
-        foreach (var amb in ambiences)
-        {
-            if (!_rules.IsTrue(player.Value, _proto.Index<RulesPrototype>(amb.Rules)))
-                continue;
-
-            return amb;
-        }
-
-        _sawmill.Warning($"Unable to find fallback ambience track");
-        return null;
-    }
-
-    /// <summary>
-    /// Fades out the current ambient music temporarily.
-    /// </summary>
     public void DisableAmbientMusic()
     {
+        if (_ambientMusicStream == null)
+        {
+            return;
+        }
         FadeOut(_ambientMusicStream);
         _ambientMusicStream = null;
     }
+
 }

Content.Client/Audio/ContentAudioSystem.cs

@@ -29,7 +29,8 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
     public const float AmbientMusicMultiplier = 3f;
     public const float LobbyMultiplier = 3f;
     public const float InterfaceMultiplier = 2f;
-    
+    public const float CombatMultiplier = 3f; //Mono
+
     public override void Initialize()
     {
         base.Initialize();
@@ -81,7 +82,7 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
         if (!_timing.IsFirstTimePredicted)
             return;
 
-        UpdateAmbientMusic();
+        UpdateAmbientMusic(frameTime);
         UpdateLobbyMusic();
         UpdateFades(frameTime);
     }

Content.Client/Beam/BeamSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2022 keronshb
-// SPDX-FileCopyrightText: 2023 metalgearsloth
-// SPDX-FileCopyrightText: 2025 bitcrushing
-//
-// SPDX-License-Identifier: MPL-2.0
-
 using Content.Client.Beam.Components;
 using Content.Shared.Beam;
 using Content.Shared.Beam.Components;

Content.Client/Buckle/BuckleSystem.cs

@@ -1,16 +1,3 @@
-// SPDX-FileCopyrightText: 2022 Nemanja
-// SPDX-FileCopyrightText: 2023 AJCM-git
-// SPDX-FileCopyrightText: 2023 DrSmugleaf
-// SPDX-FileCopyrightText: 2023 Slava0135
-// SPDX-FileCopyrightText: 2023 themias
-// SPDX-FileCopyrightText: 2024 Leon Friedrich
-// SPDX-FileCopyrightText: 2024 checkraze
-// SPDX-FileCopyrightText: 2025 Ark
-// SPDX-FileCopyrightText: 2025 Saphire Lattice
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Rotation;
 using Content.Shared.Buckle;
 using Content.Shared.Buckle.Components;

Content.Client/Cargo/BUI/CargoPalletConsoleBoundUserInterface.cs

@@ -1,11 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Checkraze
-// SPDX-FileCopyrightText: 2023 TemporalOroboros
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2024 metalgearsloth
-// SPDX-FileCopyrightText: 2025 sleepyyapril
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Cargo.UI;
 using Content.Shared.Cargo.BUI;
 using Content.Shared.Cargo.Events;

Content.Client/Cargo/UI/BountyEntry.xaml.cs

@@ -8,7 +8,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using Serilog;
 
 namespace Content.Client.Cargo.UI;
 

Content.Client/Cargo/UI/CargoPalletMenu.xaml.cs

@@ -1,10 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Checkraze
-// SPDX-FileCopyrightText: 2024 GreaseMonk
-// SPDX-FileCopyrightText: 2024 metalgearsloth
-// SPDX-FileCopyrightText: 2025 sleepyyapril
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.UserInterface.Controls;
 using Content.Shared._NF.Bank;
 using Content.Shared.Cargo;

Content.Client/CharacterInfo/CharacterInfoSystem.cs

@@ -32,6 +32,10 @@ public sealed class CharacterInfoSystem : EntitySystem
     private void OnCharacterInfoEvent(CharacterInfoEvent msg, EntitySessionEventArgs args)
     {
         var entity = GetEntity(msg.NetEntity);
+        // Mono - fix
+        if (TerminatingOrDeleted(entity))
+            return;
+
         var data = new CharacterData(entity, msg.JobTitle, msg.Objectives, msg.Briefing, Name(entity));
 
         OnCharacterUpdate?.Invoke(data);

Content.Client/Chat/Managers/ChatManager.cs

@@ -1,35 +1,3 @@
-// SPDX-FileCopyrightText: 2019 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2019 Silver
-// SPDX-FileCopyrightText: 2019 tentekal
-// SPDX-FileCopyrightText: 2020 Clement-O
-// SPDX-FileCopyrightText: 2020 Exp
-// SPDX-FileCopyrightText: 2020 Hugo Laloge
-// SPDX-FileCopyrightText: 2020 Metal Gear Sloth
-// SPDX-FileCopyrightText: 2020 ShadowCommander
-// SPDX-FileCopyrightText: 2020 zumorica
-// SPDX-FileCopyrightText: 2021 AJCM-git
-// SPDX-FileCopyrightText: 2021 Acruid
-// SPDX-FileCopyrightText: 2021 Clyybber
-// SPDX-FileCopyrightText: 2021 E F R
-// SPDX-FileCopyrightText: 2021 Galactic Chimp
-// SPDX-FileCopyrightText: 2021 Leo
-// SPDX-FileCopyrightText: 2021 Paul
-// SPDX-FileCopyrightText: 2021 Paul Ritter
-// SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto
-// SPDX-FileCopyrightText: 2021 ike709
-// SPDX-FileCopyrightText: 2021 mirrorcult
-// SPDX-FileCopyrightText: 2022 DrSmugleaf
-// SPDX-FileCopyrightText: 2022 Jezithyr
-// SPDX-FileCopyrightText: 2022 Michael Phillips
-// SPDX-FileCopyrightText: 2022 Morbo
-// SPDX-FileCopyrightText: 2022 metalgearsloth
-// SPDX-FileCopyrightText: 2022 wrexbe
-// SPDX-FileCopyrightText: 2024 Errant
-// SPDX-FileCopyrightText: 2024 Leon Friedrich
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Administration.Managers;
 using Content.Client.Ghost;
 using Content.Shared.Administration;

Content.Client/Chat/Managers/IChatManager.cs

@@ -1,15 +1,3 @@
-// SPDX-FileCopyrightText: 2019 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2019 ZelteHonor
-// SPDX-FileCopyrightText: 2021 Leo
-// SPDX-FileCopyrightText: 2021 ike709
-// SPDX-FileCopyrightText: 2022 DrSmugleaf
-// SPDX-FileCopyrightText: 2022 Jezithyr
-// SPDX-FileCopyrightText: 2022 metalgearsloth
-// SPDX-FileCopyrightText: 2024 Leon Friedrich
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Chat;
 
 namespace Content.Client.Chat.Managers

Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs

@@ -16,6 +16,7 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
     private readonly TimeSpan _typingTimeout = TimeSpan.FromSeconds(2);
     private TimeSpan _lastTextChange;
     private bool _isClientTyping;
+    private bool _isClientChatFocused;
 
     public override void Initialize()
     {
@@ -31,7 +32,8 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
             return;
 
         // client typed something - show typing indicator
-        ClientUpdateTyping(true);
+        _isClientTyping = true;
+        ClientUpdateTyping();
         _lastTextChange = _time.CurTime;
     }
 
@@ -42,36 +44,53 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
             return;
 
         // client submitted text - hide typing indicator
-        ClientUpdateTyping(false);
+        _isClientTyping = false;
+        ClientUpdateTyping();
+    }
+
+    public void ClientChangedChatFocus(bool isFocused)
+    {
+        // don't update it if player don't want to show typing
+        if (!_cfg.GetCVar(CCVars.ChatShowTypingIndicator))
+            return;
+
+        // client submitted text - hide typing indicator
+        _isClientChatFocused = isFocused;
+        ClientUpdateTyping();
     }
 
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
 
+        if (!_time.IsFirstTimePredicted)
+            return;
+
         // check if client didn't changed chat text box for a long time
         if (_isClientTyping)
         {
             var dif = _time.CurTime - _lastTextChange;
             if (dif > _typingTimeout)
             {
-                // client didn't typed anything for a long time - hide indicator
-                ClientUpdateTyping(false);
+                // client didn't typed anything for a long time - change indicator
+                _isClientTyping = false;
+                ClientUpdateTyping();
             }
         }
     }
 
-    private void ClientUpdateTyping(bool isClientTyping)
+    private void ClientUpdateTyping()
     {
-        if (_isClientTyping == isClientTyping)
-            return;
-
-        // check if player controls any entity.
+        // check if player controls any pawn
         if (_playerManager.LocalEntity == null)
             return;
+		
+        var state = TypingIndicatorState.None;
+        if (_isClientChatFocused)
+            state = _isClientTyping ? TypingIndicatorState.Typing : TypingIndicatorState.Idle;
 
-        _isClientTyping = isClientTyping;
-        RaisePredictiveEvent(new TypingChangedEvent(isClientTyping));
+        // send a networked event to server
+        RaisePredictiveEvent(new TypingChangedEvent(state));
     }
 
     private void OnShowTypingChanged(bool showTyping)
@@ -79,7 +98,8 @@ public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem
         // hide typing indicator immediately if player don't want to show it anymore
         if (!showTyping)
         {
-            ClientUpdateTyping(false);
+            _isClientTyping = false;
+            ClientUpdateTyping();
         }
     }
 }

Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs

@@ -35,7 +35,6 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
             return;
         }
 
-        AppearanceSystem.TryGetData<bool>(uid, TypingIndicatorVisuals.IsTyping, out var isTyping, args.Component);
         var layerExists = args.Sprite.LayerMapTryGet(TypingIndicatorLayers.Base, out var layer);
         if (!layerExists)
             layer = args.Sprite.LayerMapReserveBlank(TypingIndicatorLayers.Base);
@@ -44,6 +43,18 @@ public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem<TypingInd
         args.Sprite.LayerSetState(layer, proto.TypingState);
         args.Sprite.LayerSetShader(layer, proto.Shader);
         args.Sprite.LayerSetOffset(layer, proto.Offset);
-        args.Sprite.LayerSetVisible(layer, isTyping);
+		
+
+        AppearanceSystem.TryGetData<TypingIndicatorState>(uid, TypingIndicatorVisuals.State, out var state);
+        args.Sprite.LayerSetVisible(layer, state != TypingIndicatorState.None);
+        switch (state)
+        {
+            case TypingIndicatorState.Idle:
+                args.Sprite.LayerSetState(layer, proto.IdleState);
+                break;
+            case TypingIndicatorState.Typing:
+                args.Sprite.LayerSetState(layer, proto.TypingState);
+                break;
+        }
     }
 }

Content.Client/Chat/UI/EmotesMenu.xaml

@@ -9,13 +9,13 @@
     <!-- Main -->
     <ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" InitialRadius="100" ReserveSpaceForHiddenChildren="False">
         <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-general'}" TargetLayer="General" Visible="False">
-            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Head/Soft/mimesoft.rsi/icon.png"/>
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" Name="GeneralCategoryTexture"/>
         </ui:RadialMenuTextureButtonWithSector>
         <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-vocal'}" TargetLayer="Vocal" Visible="False">
             <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Interface/Emotes/vocal.png"/>
         </ui:RadialMenuTextureButtonWithSector>
         <ui:RadialMenuTextureButtonWithSector SetSize="64 64" ToolTip="{Loc 'emote-menu-category-hands'}" TargetLayer="Hands" Visible="False">
-            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" TexturePath="/Textures/Clothing/Hands/Gloves/latex.rsi/icon.png"/>
+            <TextureRect VerticalAlignment="Center" HorizontalAlignment="Center" TextureScale="2 2" Name="HandsCategoryTexture"/>
         </ui:RadialMenuTextureButtonWithSector>
     </ui:RadialContainer>
 

Content.Client/Chat/UI/EmotesMenu.xaml.cs

@@ -5,10 +5,12 @@ using Content.Shared.Speech;
 using Content.Shared.Whitelist;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Chat.UI;
 
@@ -86,6 +88,9 @@ public sealed partial class EmotesMenu : RadialMenu
                 continue;
             AddEmoteClickAction(container);
         }
+
+        GeneralCategoryTexture.Texture = spriteSystem.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Head/Soft/mimesoft.rsi"), "icon"));
+        HandsCategoryTexture.Texture = spriteSystem.Frame0(new SpriteSpecifier.Rsi(new ResPath("/Textures/Clothing/Hands/Gloves/latex.rsi"), "icon"));
     }
 
     private void AddEmoteClickAction(RadialContainer container)

Content.Client/Chat/UI/SpeechBubble.cs

@@ -1,32 +1,3 @@
-// SPDX-FileCopyrightText: 2020 ColdAutumnRain
-// SPDX-FileCopyrightText: 2020 Hugo Laloge
-// SPDX-FileCopyrightText: 2020 Visne
-// SPDX-FileCopyrightText: 2021 Acruid
-// SPDX-FileCopyrightText: 2021 Clyybber
-// SPDX-FileCopyrightText: 2021 E F R
-// SPDX-FileCopyrightText: 2021 ShadowCommander
-// SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto
-// SPDX-FileCopyrightText: 2022 20kdc
-// SPDX-FileCopyrightText: 2022 DrSmugleaf
-// SPDX-FileCopyrightText: 2022 Jezithyr
-// SPDX-FileCopyrightText: 2022 Leon Friedrich
-// SPDX-FileCopyrightText: 2022 Michael Phillips
-// SPDX-FileCopyrightText: 2022 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2022 metalgearsloth
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2023 Vasilis
-// SPDX-FileCopyrightText: 2023 deathride58
-// SPDX-FileCopyrightText: 2024 Plykiya
-// SPDX-FileCopyrightText: 2024 SlamBamActionman
-// SPDX-FileCopyrightText: 2024 TemporalOroboros
-// SPDX-FileCopyrightText: 2024 Winkarst
-// SPDX-FileCopyrightText: 2024 chromiumboy
-// SPDX-FileCopyrightText: 2024 maylokana
-// SPDX-FileCopyrightText: 2025 Tayrtahn
-// SPDX-FileCopyrightText: 2025 noirogen
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Numerics;
 using Content.Client.Chat.Managers;
 using Content.Shared.CCVar;

Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs

@@ -48,6 +48,10 @@ namespace Content.Client.Chemistry.UI
                     (uint) _window.BottleDosage.Value, _window.LabelLine));
             _window.BufferSortButton.OnPressed += _ => SendMessage(
                     new ChemMasterSortingTypeCycleMessage());
+            _window.OutputBufferDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.Internal));
+            _window.OutputBeakerDraw.OnPressed += _ => SendMessage(
+                new ChemMasterOutputDrawSourceMessage(ChemMasterDrawSource.External));
 
             for (uint i = 0; i < _window.PillTypeButtons.Length; i++)
             {

Content.Client/Chemistry/UI/ChemMasterWindow.xaml

@@ -79,9 +79,12 @@
 
             <!-- Packaging -->
             <BoxContainer Orientation="Horizontal">
-                <Label Text="{Loc 'chem-master-window-packaging-text'}" />
+                <Label Text="{Loc 'chem-master-output-source'}" StyleClasses="LabelSecondaryColor" Margin="0 0 5 0"/>
+                <Button MinSize="80 0" Name="OutputBufferDraw" Access="Public" Text="{Loc 'chem-master-output-buffer-draw'}" ToggleMode="True" StyleClasses="OpenRight" />
+                <Button MinSize="80 0" Name="OutputBeakerDraw" Access="Public" Text="{Loc 'chem-master-output-beaker-draw'}" ToggleMode="True" StyleClasses="OpenLeft" />
                 <Control HorizontalExpand="True"/>
-                <Label Text="{Loc 'chem-master-window-buffer-label'}" />
+                <!-- Output Draw Source -->
+                <Label Name="DrawSource"/>
                 <Label Name="BufferCurrentVolume" StyleClasses="LabelSecondaryColor" />
             </BoxContainer>
 

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -6,7 +6,6 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.Utility;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
@@ -14,6 +13,7 @@ using System.Numerics;
 using Content.Shared.FixedPoint;
 using Robust.Client.Graphics;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
+using Robust.Client.GameObjects;
 
 namespace Content.Client.Chemistry.UI
 {
@@ -24,6 +24,8 @@ namespace Content.Client.Chemistry.UI
     public sealed partial class ChemMasterWindow : FancyWindow
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        private readonly SpriteSystem _sprite;
         public event Action<BaseButton.ButtonEventArgs, ReagentButton>? OnReagentButtonPressed;
         public readonly Button[] PillTypeButtons;
 
@@ -37,6 +39,7 @@ namespace Content.Client.Chemistry.UI
         {
             RobustXamlLoader.Load(this);
             IoCManager.InjectDependencies(this);
+            _sprite = _entityManager.System<SpriteSystem>();
 
             // Pill type selection buttons, in total there are 20 pills.
             // Pill rsi file should have states named as pill1, pill2, and so on.
@@ -67,9 +70,9 @@ namespace Content.Client.Chemistry.UI
 
                 // Generate buttons textures
                 var specifier = new SpriteSpecifier.Rsi(resourcePath, "pill" + (i + 1));
-                TextureRect pillTypeTexture = new TextureRect
+                var pillTypeTexture = new TextureRect
                 {
-                    Texture = specifier.Frame0(),
+                    Texture = _sprite.Frame0(specifier),
                     TextureScale = new Vector2(1.75f, 1.75f),
                     Stretch = TextureRect.StretchMode.KeepCentered,
                 };
@@ -141,7 +144,17 @@ namespace Content.Client.Chemistry.UI
             // Ensure the Panel Info is updated, including UI elements for Buffer Volume, Output Container and so on
             UpdatePanelInfo(castState);
 
-            BufferCurrentVolume.Text = $" {castState.BufferCurrentVolume?.Int() ?? 0}u";
+            switch (castState.DrawSource)
+            {
+                case ChemMasterDrawSource.Internal:
+                    SetBufferText(castState.BufferCurrentVolume, "chem-master-output-buffer-draw");
+                    break;
+                case ChemMasterDrawSource.External:
+                    SetBufferText(castState.InputContainerInfo?.CurrentVolume, "chem-master-output-beaker-draw");
+                    break;
+                default:
+                    throw new($"Chemmaster {castState.OutputContainerInfo} draw source is not set");
+            }
 
             InputEjectButton.Disabled = castState.InputContainerInfo is null;
             OutputEjectButton.Disabled = castState.OutputContainerInfo is null;
@@ -159,9 +172,14 @@ namespace Content.Client.Chemistry.UI
             var holdsReagents = output?.Reagents != null;
             var pillNumberMax = holdsReagents ? 0 : remainingCapacity;
             var bottleAmountMax = holdsReagents ? remainingCapacity : 0;
-            var bufferVolume = castState.BufferCurrentVolume?.Int() ?? 0;
+            var outputVolume = castState.DrawSource switch
+            {
+                ChemMasterDrawSource.Internal => castState.BufferCurrentVolume?.Int() ?? 0,
+                ChemMasterDrawSource.External => castState.InputContainerInfo?.CurrentVolume.Int() ?? 0,
+                _ => 0,
+            };
 
-            PillDosage.Value = (int)Math.Min(bufferVolume, castState.PillDosageLimit);
+            PillDosage.Value = (int)Math.Min(outputVolume, castState.PillDosageLimit);
 
             PillTypeButtons[castState.SelectedPillType].Pressed = true;
 
@@ -177,25 +195,36 @@ namespace Content.Client.Chemistry.UI
             // Avoid division by zero
             if (PillDosage.Value > 0)
             {
-                PillNumber.Value = Math.Min(bufferVolume / PillDosage.Value, pillNumberMax);
+                PillNumber.Value = Math.Min(outputVolume / PillDosage.Value, pillNumberMax);
             }
             else
             {
                 PillNumber.Value = 0;
             }
 
-            BottleDosage.Value = Math.Min(bottleAmountMax, bufferVolume);
+            BottleDosage.Value = Math.Min(bottleAmountMax, outputVolume);
         }
         /// <summary>
-        /// Generate a product label based on reagents in the buffer.
+        /// Generate a product label based on reagents in the buffer or beaker.
         /// </summary>
         /// <param name="state">State data sent by the server.</param>
         private string GenerateLabel(ChemMasterBoundUserInterfaceState state)
         {
             if (state.BufferCurrentVolume == 0)
+            if (
+                state.BufferCurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.Internal ||
+                state.InputContainerInfo?.CurrentVolume == 0 && state.DrawSource == ChemMasterDrawSource.External ||
+                state.InputContainerInfo?.Reagents == null
+            )
                 return "";
 
-            var reagent = state.BufferReagents.OrderBy(r => r.Quantity).First().Reagent;
+            var reagent = (state.DrawSource switch
+                {
+                    ChemMasterDrawSource.Internal => state.BufferReagents,
+                    ChemMasterDrawSource.External => state.InputContainerInfo?.Reagents ?? [],
+                    _ => throw new($"Chemmaster {state.OutputContainerInfo} draw source is not set"),
+                }).MinBy(r => r.Quantity)
+                .Reagent;
             _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);
             return proto?.LocalizedName ?? "";
         }
@@ -224,6 +253,9 @@ namespace Content.Client.Chemistry.UI
                 _ => Loc.GetString("chem-master-window-sort-type-none")
             };
 
+            OutputBufferDraw.Pressed = state.DrawSource == ChemMasterDrawSource.Internal;
+            OutputBeakerDraw.Pressed = state.DrawSource == ChemMasterDrawSource.External;
+
 
             if (!state.BufferReagents.Any())
             {
@@ -405,6 +437,12 @@ namespace Content.Client.Chemistry.UI
             get => LabelLineEdit.Text;
             set => LabelLineEdit.Text = value;
         }
+
+        private void SetBufferText(FixedPoint2? volume, string text)
+        {
+            BufferCurrentVolume.Text = $" {volume ?? FixedPoint2.Zero}u";
+            DrawSource.Text = Loc.GetString(text);
+        }
     }
 
     public sealed class ReagentButton : Button

Content.Client/Clock/ClockSystem.cs

@@ -1,8 +1,3 @@
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2025 bitcrushing
-//
-// SPDX-License-Identifier: MPL-2.0
-
 using Content.Shared.Clock;
 using Robust.Client.GameObjects;
 

Content.Client/Clothing/Systems/ChameleonClothingSystem.cs

@@ -1,12 +1,3 @@
-// SPDX-FileCopyrightText: 2022 Alex Evgrashin
-// SPDX-FileCopyrightText: 2022 Moony
-// SPDX-FileCopyrightText: 2023 DrSmugleaf
-// SPDX-FileCopyrightText: 2023 Leon Friedrich
-// SPDX-FileCopyrightText: 2025 SlamBamActionman
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Linq;
 using Content.Client.PDA;
 using Content.Shared.Clothing.Components;

Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs

@@ -1,12 +1,3 @@
-// SPDX-FileCopyrightText: 2022 Alex Evgrashin
-// SPDX-FileCopyrightText: 2022 Moony
-// SPDX-FileCopyrightText: 2023 TemporalOroboros
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2025 SlamBamActionman
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Clothing.Systems;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Tag;

Content.Client/CombatMode/ColoredScreenBorderOverlay.cs

@@ -1,21 +1,3 @@
-// SPDX-FileCopyrightText: 2018 clusterfack
-// SPDX-FileCopyrightText: 2019 Silver
-// SPDX-FileCopyrightText: 2019 ZelteHonor
-// SPDX-FileCopyrightText: 2020 R. Neuser
-// SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto
-// SPDX-FileCopyrightText: 2021 20kdc
-// SPDX-FileCopyrightText: 2021 Acruid
-// SPDX-FileCopyrightText: 2021 DrSmugleaf
-// SPDX-FileCopyrightText: 2021 E F R
-// SPDX-FileCopyrightText: 2021 GraniteSidewalk
-// SPDX-FileCopyrightText: 2021 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2021 Visne
-// SPDX-FileCopyrightText: 2022 metalgearsloth
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2025 bitcrushing
-//
-// SPDX-License-Identifier: MPL-2.0
-
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;

Content.Client/CombatMode/CombatModeIndicatorsOverlay.cs

@@ -1,12 +1,3 @@
-// SPDX-FileCopyrightText: 2023 Artjom
-// SPDX-FileCopyrightText: 2023 TemporalOroboros
-// SPDX-FileCopyrightText: 2023 metalgearsloth
-// SPDX-FileCopyrightText: 2024 I.K
-// SPDX-FileCopyrightText: 2025 bitcrushing
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: MPL-2.0
-
 using System.Numerics;
 using Content.Client.Hands.Systems;
 using Content.Shared._RMC14.CombatMode; // Mono

Content.Client/Configurable/ConfigurationSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Configurable.UI;
 using Content.Shared.Configurable;
 

Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs

@@ -1,16 +1,3 @@
-// SPDX-FileCopyrightText: 2020 Julian Giebel
-// SPDX-FileCopyrightText: 2021 Acruid
-// SPDX-FileCopyrightText: 2021 DrSmugleaf
-// SPDX-FileCopyrightText: 2022 Leon Friedrich
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2023 TemporalOroboros
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Numerics;
 using System.Text.RegularExpressions;
 using Content.Shared.Configurable;

Content.Client/Configurable/UI/ConfigurationMenu.cs

@@ -1,19 +1,3 @@
-// SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto
-// SPDX-FileCopyrightText: 2021 DrSmugleaf
-// SPDX-FileCopyrightText: 2021 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2021 Visne
-// SPDX-FileCopyrightText: 2022 Paul Ritter
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2022 wrexbe
-// SPDX-FileCopyrightText: 2023 Checkraze
-// SPDX-FileCopyrightText: 2023 Julian Giebel
-// SPDX-FileCopyrightText: 2024 Nemanja
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Numerics;
 using System.Text.RegularExpressions;
 using Robust.Client.UserInterface;

Content.Client/Construction/ConstructionPlacementHijack.cs

@@ -1,19 +1,3 @@
-// SPDX-FileCopyrightText: 2019 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2019 Silver
-// SPDX-FileCopyrightText: 2019 ZelteHonor
-// SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto
-// SPDX-FileCopyrightText: 2021 Acruid
-// SPDX-FileCopyrightText: 2021 DrSmugleaf
-// SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto
-// SPDX-FileCopyrightText: 2023 08A
-// SPDX-FileCopyrightText: 2023 metalgearsloth
-// SPDX-FileCopyrightText: 2025 ArtisticRoomba
-// SPDX-FileCopyrightText: 2025 ScyronX
-// SPDX-FileCopyrightText: 2025 chromiumboy
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Linq;
 using Content.Shared.Construction.Prototypes;
 using Robust.Client.Placement;

Content.Client/Construction/ConstructionSystem.cs

@@ -1,30 +1,3 @@
-// SPDX-FileCopyrightText: 2020 ColdAutumnRain
-// SPDX-FileCopyrightText: 2020 Exp
-// SPDX-FileCopyrightText: 2020 Julian Giebel
-// SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto
-// SPDX-FileCopyrightText: 2021 Acruid
-// SPDX-FileCopyrightText: 2021 DrSmugleaf
-// SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto
-// SPDX-FileCopyrightText: 2021 Visne
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2023 08A
-// SPDX-FileCopyrightText: 2023 Checkraze
-// SPDX-FileCopyrightText: 2023 Leon Friedrich
-// SPDX-FileCopyrightText: 2023 Tom Leys
-// SPDX-FileCopyrightText: 2023 deltanedas
-// SPDX-FileCopyrightText: 2023 metalgearsloth
-// SPDX-FileCopyrightText: 2023 themias
-// SPDX-FileCopyrightText: 2024 Cojoke
-// SPDX-FileCopyrightText: 2024 Kara
-// SPDX-FileCopyrightText: 2024 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2024 Plykiya
-// SPDX-FileCopyrightText: 2024 Tayrtahn
-// SPDX-FileCopyrightText: 2024 TemporalOroboros
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 Kyle Tyo
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using System.Diagnostics.CodeAnalysis;
 using Content.Client.Popups;
 using Content.Shared.Construction;

Content.Client/Content.Client.csproj

@@ -1,26 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
-    <TargetFramework>$(TargetFramework)</TargetFramework>
-    <LangVersion>12</LangVersion>
-    <IsPackable>false</IsPackable>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\bin\Content.Client\</OutputPath>
     <OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
-    <Nullable>enable</Nullable>
-    <Configurations>Debug;Release;Tools;DebugOpt</Configurations>
-    <Platforms>AnyCPU</Platforms>
+    <WarningsAsErrors>RA0032;nullable</WarningsAsErrors>
   </PropertyGroup>
+  <Import Project="../MSBuild/Content.props" />
   <ItemGroup>
     <PackageReference Include="Nett" />
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
+    <PackageReference Include="SixLabors.ImageSharp" />
+    <PackageReference Include="Pidgin" />
+    <PackageReference Include="Robust.Shared.AuthLib" />
   </ItemGroup>
+
+  <Import Project="..\RobustToolbox\Imports\Lidgren.props" />
+  <Import Project="..\RobustToolbox\Imports\Client.props" />
+  <Import Project="..\RobustToolbox\Imports\Shared.props" />
+
   <ItemGroup>
-    <ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
-    <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
   <ItemGroup>

Content.Client/Cooldown/CooldownGraphic.cs

@@ -1,4 +1,5 @@
-using Robust.Client.Graphics;
+using System.Numerics;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
@@ -34,7 +35,7 @@ namespace Content.Client.Cooldown
             if (Progress >= 0f)
             {
                 var hue = (5f / 18f) * lerp;
-                color = Color.FromHsv((hue, 0.75f, 0.75f, 0.50f));
+                color = Color.FromHsv(new Vector4(hue, 0.75f, 0.75f, 0.50f));
             }
             else
             {

Content.Client/Decals/DecalSystem.cs

@@ -1,14 +1,3 @@
-// SPDX-FileCopyrightText: 2021 Paul
-// SPDX-FileCopyrightText: 2021 Paul Ritter
-// SPDX-FileCopyrightText: 2022 Acruid
-// SPDX-FileCopyrightText: 2022 metalgearsloth
-// SPDX-FileCopyrightText: 2022 mirrorcult
-// SPDX-FileCopyrightText: 2024 Leon Friedrich
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Decals.Overlays;
 using Content.Shared.Decals;
 using Robust.Client.GameObjects;

Content.Client/DeviceNetwork/Systems/DeviceNetworkSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.DeviceNetwork.Systems;
 
 namespace Content.Client.DeviceNetwork.Systems;

Content.Client/Disposal/Mailing/MailingUnitBoundUserInterface.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Disposal.Unit;
 using Content.Client.Power.EntitySystems;
 using Content.Shared.Disposal;

Content.Client/Disposal/Mailing/MailingUnitSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Disposal;
 using Content.Shared.Disposal.Components;
 using Content.Shared.Disposal.Mailing;

Content.Client/Disposal/Mailing/MailingUnitWindow.xaml.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;

Content.Client/Disposal/PressureBar.cs

@@ -1,4 +1,5 @@
-using Content.Shared.Disposal;
+using System.Numerics;
+using Content.Shared.Disposal;
 using Content.Shared.Disposal.Unit;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;

Content.Client/Disposal/Tube/DisposalTubeSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Disposal.Unit;
 
 namespace Content.Client.Disposal.Tube;

Content.Client/Disposal/Unit/DisposalUnitBoundUserInterface.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.Disposal.Mailing;
 using Content.Client.Power.EntitySystems;
 using Content.Shared.Disposal.Components;

Content.Client/Disposal/Unit/DisposalUnitSystem.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Shared.Disposal.Components;
 using Content.Shared.Disposal.Unit;
 using Robust.Client.Animations;

Content.Client/Disposal/Unit/DisposalUnitWindow.xaml.cs

@@ -1,9 +1,3 @@
-// SPDX-FileCopyrightText: 2025 Ilya246
-// SPDX-FileCopyrightText: 2025 metalgearsloth
-// SPDX-FileCopyrightText: 2025 starch
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;

Content.Client/Drunk/DrunkOverlay.cs

@@ -1,12 +1,3 @@
-// SPDX-FileCopyrightText: 2022 Kara D
-// SPDX-FileCopyrightText: 2022 Leon Friedrich
-// SPDX-FileCopyrightText: 2023 Waylon Cude
-// SPDX-FileCopyrightText: 2023 metalgearsloth
-// SPDX-FileCopyrightText: 2024 Pieter-Jan Briers
-// SPDX-FileCopyrightText: 2025 ark1368
-//
-// SPDX-License-Identifier: MPL-2.0
-
 using Content.Shared.Drunk;
 using Content.Shared.StatusEffect;
 using Robust.Client.Graphics;