Try gamedata approach

Use contexts
Additional safety check
2025-12-06 06:22:44 -08:00 · 2025-10-27 19:44:38 -07:00 · 2025-10-27 19:10:31 -07:00 · 2025-10-27 17:31:59 -07:00 · 2025-10-27 17:23:33 -07:00 · 2025-10-27 17:08:08 -07:00
224 changed files with 4668 additions and 640 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: [msws] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: msws # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -38,7 +38,7 @@ jobs:
      - name: Publish Test Project
        run: dotnet publish TTT/Test/Test.csproj --no-restore --no-build -o build_output -c Debug

-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
        with:
          name: build_output
          path: build_output
@@ -59,7 +59,7 @@ jobs:
          dotnet-version: '8.0.x'

      - name: Download Build Output
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
        with:
          name: build_output
          path: build_output
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,7 +33,31 @@ jobs:
        id: gitversion
        uses: gittools/actions/gitversion/execute@v4

+      # Early exit guard: if tag already exists, mark and skip all following steps
+      - name: Check if tag exists
+        id: tag_exists
+        run: |
+          set -euo pipefail
+          git fetch --tags --force
+          TAG="${{ steps.gitversion.outputs.fullSemVer }}"
+          if git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+            echo "Tag ${TAG} already exists locally."
+          elif git ls-remote --tags origin "refs/tags/${TAG}" | grep -q "refs/tags/${TAG}$"; then
+            echo "exists=true" >> "$GITHUB_OUTPUT"
+            echo "Tag ${TAG} already exists on origin."
+          else
+            echo "exists=false" >> "$GITHUB_OUTPUT"
+            echo "Tag ${TAG} does not exist. Continuing."
+          fi
+
+      # Short-circuit info step for logs
+      - name: Tag exists, nothing to do
+        if: steps.tag_exists.outputs.exists == 'true'
+        run: echo "Release already exists for tag ${{ steps.gitversion.outputs.fullSemVer }}. Exiting successfully."
+
      - name: Build Locale
+        if: steps.tag_exists.outputs.exists != 'true'
        run: |
          mkdir -p build/TTT/lang
          dotnet restore Locale/Locale.csproj
@@ -41,22 +65,26 @@ jobs:
          cp lang/*.json build/TTT/lang

      - name: Copy Gamedata
+        if: steps.tag_exists.outputs.exists != 'true'
        run: |
          mkdir -p build/TTT/gamedata
          cp -r TTT/CS2/gamedata/* build/TTT/gamedata

      - name: Publish Plugin
+        if: steps.tag_exists.outputs.exists != 'true'
        run: |
          dotnet restore TTT/Plugin/Plugin.csproj
          dotnet publish TTT/Plugin/Plugin.csproj --no-restore -c Release -o build/TTT

      - name: Zip Artifacts
+        if: steps.tag_exists.outputs.exists != 'true'
        run: |
          cd build/TTT
          zip -r TTT-${{ steps.gitversion.outputs.fullSemVer }}.zip *

      # 2. Get latest tag
      - name: Get latest tag
+        if: steps.tag_exists.outputs.exists != 'true'
        id: latest_tag
        run: |
          if git describe --tags --abbrev=0 >/dev/null 2>&1; then
@@ -66,58 +94,59 @@ jobs:
          fi

      - name: Create and push new tag
-        if: steps.gitversion.outputs.fullSemVer != steps.latest_tag.outputs.tag
+        if: steps.tag_exists.outputs.exists != 'true' && steps.gitversion.outputs.fullSemVer != steps.latest_tag.outputs.tag
        run: |
+          set -euo pipefail
+          TAG="${{ steps.gitversion.outputs.fullSemVer }}"
          git config user.name "github-actions[bot]"
          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git tag ${{ steps.gitversion.outputs.fullSemVer }}
-          git push origin ${{ steps.gitversion.outputs.fullSemVer }}
+          if ! git rev-parse -q --verify "refs/tags/${TAG}" >/dev/null; then
+            git tag "${TAG}"
+          fi
+          if git ls-remote --tags origin "refs/tags/${TAG}" | grep -q "refs/tags/${TAG}$"; then
+            echo "Tag ${TAG} already on origin. Skipping push."
+          else
+            git push origin "${TAG}"
+          fi

      - name: Determine previous relevant tag
+        if: steps.tag_exists.outputs.exists != 'true'
        id: prev_tag
        run: |
          set -euo pipefail
          branch="${GITHUB_REF_NAME}"

-          # Use HEAD^ to skip the tag we just created. If no parent, fall back to HEAD.
          if git rev-parse --verify -q HEAD^ >/dev/null; then
            base_rev="HEAD^"
          else
            base_rev="HEAD"
          fi

-          # Match stable tags on main and prerelease tags on non-main
          if [[ "$branch" == "main" ]]; then
            pattern='[0-9]*.[0-9]*.[0-9]*'
          else
            pattern='[0-9]*.[0-9]*.[0-9]*-*'
          fi

-          # Nearest tag reachable on this lineage, not just "second most recent by date"
          prev=$(git describe --tags --abbrev=0 --match "$pattern" --tags "$base_rev" 2>/dev/null || true)
-
          echo "tag=${prev:-0.0.0}" >> "$GITHUB_OUTPUT"

-
      - name: Generate changelog
+        if: steps.tag_exists.outputs.exists != 'true'
        run: |
          set -euo pipefail

          prev="${{ steps.prev_tag.outputs.tag }}"
          curr="${{ steps.gitversion.outputs.fullSemVer }}"

-          # Choose what you want in the raw feed: %s = subject only, %B = full message
          GIT_LOG_FORMAT='%B'

          if [[ "$prev" == "0.0.0" ]]; then
-            # First release: whole history to this tag, first-parent to reflect main’s narrative
            git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$curr" > CHANGELOG.md
          else
-            # Strict range between the previous reachable tag and the new tag on this lineage
            git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$prev..$curr" > CHANGELOG.md
          fi

-          # Fallback in case nothing was captured
          if [[ ! -s CHANGELOG.md ]]; then
            echo "No commits found between $prev and $curr on first-parent. Using full messages without first-parent filter." >&2
            if [[ "$prev" == "0.0.0" ]]; then
@@ -131,7 +160,7 @@ jobs:

      - name: Rewrite changelog with OpenAI
        id: ai_changelog
-        if: success()
+        if: steps.tag_exists.outputs.exists != 'true'
        env:
          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
          OPENAI_MODEL: ${{ env.OPENAI_MODEL }}
@@ -140,25 +169,19 @@ jobs:
        run: |
          set -euo pipefail

-          # Ensure we have a changelog to work with
          if [[ ! -s CHANGELOG.md ]]; then
            echo "CHANGELOG.md is empty. Skipping AI rewrite."
            echo "skipped=true" >> $GITHUB_OUTPUT
            exit 0
          fi

-          # Trim the input to a safe size for token limits
          head -c "${MAX_CHANGELOG_CHARS}" CHANGELOG.md > CHANGELOG_RAW.md

-          # Build the JSON body. We feed system guidance and the raw changelog
-          # See OpenAI Responses API docs for the schema and output_text helper. :contentReference[oaicite:0]{index=0}
          jq -Rs --arg sys "You are an expert release-notes writer. Given a list of changes in various formats (e.g: commits, merges, etc.), write release notes intended for reading by the public, grouping by features, features, and other pertinent groups where appropriate. Do not include a group if it is unnecessary. Remove internal ticket IDs and commit hashes unless essential. Merge duplicates. Use imperative, past tense voice with proper prose. Output valid Markdown only." \
                --arg temp "${OPENAI_TEMPERATURE}" \
                --arg model "${OPENAI_MODEL}" \
                '{model:$model, temperature: ($temp|tonumber), input:[{role:"system", content:$sys},{role:"user", content:.}]}' CHANGELOG_RAW.md > request.json

-          # Call the API
-          # Basic retry on transient failures
          for i in 1 2 3; do
            HTTP_CODE=$(curl -sS -w "%{http_code}" -o ai_response.json \
              https://api.openai.com/v1/responses \
@@ -175,14 +198,12 @@ jobs:
            exit 0
          fi

-          # Prefer output_text if present. Fallback to first text item. :contentReference[oaicite:1]{index=1}
          if jq -e '.output_text' ai_response.json >/dev/null; then
            jq -r '.output_text' ai_response.json > CHANGELOG.md
          else
            jq -r '.output[0].content[] | select(.type=="output_text") | .text' ai_response.json | sed '/^[[:space:]]*$/d' > CHANGELOG.md
          fi

-          # If the rewrite somehow produced an empty file, keep the raw one
          if [[ ! -s CHANGELOG.md ]]; then
            echo "AI returned empty content. Restoring raw changelog."
            mv CHANGELOG_RAW.md CHANGELOG.md
@@ -195,6 +216,7 @@ jobs:
          cat CHANGELOG.md

      - name: Create GitHub release
+        if: steps.tag_exists.outputs.exists != 'true'
        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ steps.gitversion.outputs.fullSemVer }}
@@ -204,9 +226,8 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-      # 7. Cleanup old pre-releases
      - name: Delete old pre-releases
-        if: github.ref_name != 'main'
+        if: steps.tag_exists.outputs.exists != 'true' && github.ref_name != 'main'
        run: |
          gh release list --limit 100 --json name,isPrerelease \
            --jq '.[] | select(.isPrerelease) | .name' | tail -n +11 | \
--- a/LICENSES.MD
+++ b/LICENSES.MD
@@ -4,12 +4,14 @@
 | CounterStrikeSharp.API                                | 1.0.340  | Expression                 | GPL-3.0-only       | https://licenses.nuget.org/GPL-3.0-only |                                                 | Roflmuffin                           | http://docs.cssharp.dev/                                                                         |
 | Dapper                                                | 2.1.66   | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | 2019 Stack Exchange, Inc.                       | Sam Saffron,Marc Gravell,Nick Craver | https://github.com/DapperLib/Dapper                                                              |
 | JetBrains.Annotations                                 | 2025.2.0 | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) 2016-2025 JetBrains s.r.o.        | JetBrains                            | https://www.jetbrains.com/help/resharper/Code_Analysis__Code_Annotations.html                    |
+| Microsoft.Data.Sqlite                                 | 9.0.9    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://docs.microsoft.com/dotnet/standard/data/sqlite/                                          |
 | Microsoft.Extensions.DependencyInjection.Abstractions | 9.0.7    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://dot.net/                                                                                 |
 | Microsoft.Extensions.Localization.Abstractions        | 8.0.3    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://asp.net/                                                                                 |
 | Microsoft.NET.Test.Sdk                                | 17.14.1  | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://github.com/microsoft/vstest                                                              |
 | Microsoft.Reactive.Testing                            | 6.0.1    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors     | https://github.com/dotnet/reactive                                                               |
 | Microsoft.Testing.Extensions.CodeCoverage             | 17.14.2  | Unknown                    |                    | https://aka.ms/deprecateLicenseUrl      | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://github.com/microsoft/codecoverage                                                        |
 | MySqlConnector                                        | 2.4.0    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright 2016–2024 Bradley Grainger            | Bradley Grainger                     | https://mysqlconnector.net/                                                                      |
+| SQLite                                                | 3.13.0   | Unknown                    |                    |                                         | Public Domain                                   | SQLite Development Team              |                                                                                                  |
 | System.Reactive                                       | 6.0.1    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) .NET Foundation and Contributors. | .NET Foundation and Contributors     | https://github.com/dotnet/reactive                                                               |
 | System.Text.Json                                      | 8.0.5    | Expression                 | MIT                | https://licenses.nuget.org/MIT          | © Microsoft Corporation. All rights reserved.   | Microsoft                            | https://dot.net/                                                                                 |
 | Xunit.DependencyInjection                             | 10.6.0   | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright © 2019                                | Wei Peng                             | https://github.com/pengweiqhca/Xunit.DependencyInjection/tree/main/src/Xunit.DependencyInjection |
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ survive while eliminating the traitors among them.
    - [X] Traitors
    - [X] Detectives
    - [X] Innocents
- [ ] Shop
- [ ] Karma
+- [X] Shop
+- [X] Karma
 - [ ] Statistics

 ## Versioning
--- a/SpecialRoundAPI/SpecialRoundAPI/AbstractSpecialRound.cs
+++ b/SpecialRoundAPI/SpecialRoundAPI/AbstractSpecialRound.cs
@@ -0,0 +1,29 @@
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Events;
+using TTT.Game.Events.Game;
+using TTT.Locale;
+
+namespace SpecialRoundAPI;
+
+public abstract class AbstractSpecialRound(IServiceProvider provider)
+  : ITerrorModule, IListener {
+  protected readonly IServiceProvider Provider = provider;
+
+  protected readonly ISpecialRoundTracker Tracker =
+    provider.GetRequiredService<ISpecialRoundTracker>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public abstract string Name { get; }
+  public abstract IMsg Description { get; }
+  public abstract SpecialRoundConfig Config { get; }
+
+  public abstract void ApplyRoundEffects();
+
+  [UsedImplicitly]
+  [EventHandler]
+  public abstract void OnGameState(GameStateUpdateEvent ev);
+}
--- a/SpecialRoundAPI/SpecialRoundAPI/BhopRoundConfig.cs
+++ b/SpecialRoundAPI/SpecialRoundAPI/BhopRoundConfig.cs
@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI;
+
+public record BhopRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.2f;
+}
--- a/SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundStarter.cs
+++ b/SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundStarter.cs
@@ -0,0 +1,13 @@
+namespace SpecialRoundAPI;
+
+public interface ISpecialRoundStarter {
+  /// <summary>
+  /// Attempts to start the given special round.
+  /// Will bypass most checks, but may still return null if starting the round
+  /// is not possible.
+  /// </summary>
+  /// <param name="round"></param>
+  /// <returns></returns>
+  public AbstractSpecialRound?
+    TryStartSpecialRound(AbstractSpecialRound? round);
+}
--- a/SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundTracker.cs
+++ b/SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundTracker.cs
@@ -0,0 +1,6 @@
+namespace SpecialRoundAPI;
+
+public interface ISpecialRoundTracker {
+  public AbstractSpecialRound? CurrentRound { get; set; }
+  public int RoundsSinceLastSpecial { get; set; }
+}
--- a/SpecialRoundAPI/SpecialRoundAPI/SpecialRoundAPI.csproj
+++ b/SpecialRoundAPI/SpecialRoundAPI/SpecialRoundAPI.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Locale\Locale.csproj" />
+    <ProjectReference Include="..\..\TTT\API\API.csproj" />
+    <ProjectReference Include="..\..\TTT\Game\Game.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/SpecialRoundAPI/SpecialRoundAPI/SpecialRoundConfig.cs
+++ b/SpecialRoundAPI/SpecialRoundAPI/SpecialRoundConfig.cs
@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI;
+
+public abstract record SpecialRoundConfig {
+  public abstract float Weight { get; init; }
+}
--- a/SpecialRoundAPI/SpecialRoundAPI/SpeedRoundConfig.cs
+++ b/SpecialRoundAPI/SpecialRoundAPI/SpeedRoundConfig.cs
@@ -0,0 +1,8 @@
+namespace SpecialRoundAPI;
+
+public record SpeedRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.4f;
+
+  public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(60);
+  public TimeSpan SecondsPerKill { get; init; } = TimeSpan.FromSeconds(10);
+}
--- a/SpecialRoundAPI/SpecialRoundAPI/VanillaRoundConfig.cs
+++ b/SpecialRoundAPI/SpecialRoundAPI/VanillaRoundConfig.cs
@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI;
+
+public record VanillaRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.3f;
+}
--- a/TTT.sln
+++ b/TTT.sln
@@ -23,6 +23,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Karma", "TTT\Karma\Karma.cs
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShopAPI", "TTT\ShopAPI\ShopAPI.csproj", "{16F720B5-9D45-47BF-8C80-4F91005E36D1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RTD", "TTT\RTD\RTD.csproj", "{8A426E84-45DA-4558-A218-E042F1AC60B2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stats", "TTT\Stats\Stats.csproj", "{256473A2-6ACD-440C-83FA-6056147656C7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRound", "TTT\SpecialRound\SpecialRound.csproj", "{5092069A-3CFA-41C8-B685-341040AB435C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpecialRoundAPI", "SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj", "{360FEF16-54DA-42EE-995A-3D31C699287D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +80,22 @@ Global
 		{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A426E84-45DA-4558-A218-E042F1AC60B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{256473A2-6ACD-440C-83FA-6056147656C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5092069A-3CFA-41C8-B685-341040AB435C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5092069A-3CFA-41C8-B685-341040AB435C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5092069A-3CFA-41C8-B685-341040AB435C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5092069A-3CFA-41C8-B685-341040AB435C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{360FEF16-54DA-42EE-995A-3D31C699287D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{360FEF16-54DA-42EE-995A-3D31C699287D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{360FEF16-54DA-42EE-995A-3D31C699287D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{360FEF16-54DA-42EE-995A-3D31C699287D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
--- a/TTT/API/Events/Event.cs
+++ b/TTT/API/Events/Event.cs
@@ -1,5 +1,5 @@
 namespace TTT.API.Events;

-public abstract class Event {
-  public abstract string Id { get; }
+public class Event {
+  public virtual string Id => GetType().Name.ToLowerInvariant();
 }
--- a/TTT/API/Events/IEventBus.cs
+++ b/TTT/API/Events/IEventBus.cs
@@ -5,5 +5,5 @@ public interface IEventBus {

  void UnregisterListener(IListener listener);

-  Task Dispatch(Event ev);
+  void Dispatch(Event ev);
 }
--- a/TTT/API/Extensions/ServiceCollectionExtensions.cs
+++ b/TTT/API/Extensions/ServiceCollectionExtensions.cs
@@ -24,7 +24,7 @@ public static class ServiceCollectionExtensions {
      collection.AddTransient<ICommand>(provider
        => (provider.GetRequiredService<TExtension>() as ICommand)!);

-    collection.AddScoped<TExtension>();
+    collection.AddSingleton<TExtension>();

    collection.AddTransient<ITerrorModule, TExtension>(provider
      => provider.GetRequiredService<TExtension>());
--- a/TTT/API/Game/IActionLogger.cs
+++ b/TTT/API/Game/IActionLogger.cs
@@ -18,4 +18,6 @@ public interface IActionLogger {

  void PrintLogs();
  void PrintLogs(IOnlinePlayer? player);
+  
+  string[] MakeLogs();
 }
--- a/TTT/API/Game/IGame.cs
+++ b/TTT/API/Game/IGame.cs
@@ -33,9 +33,6 @@ public interface IGame : IDisposable {

  bool CheckEndConditions();

-  [Obsolete("This method is ambiguous, check the game state directly.")]
-  bool IsInProgress() { return State is State.COUNTDOWN or State.IN_PROGRESS; }
-
  ISet<IOnlinePlayer> GetAlive() {
    return Players.OfType<IOnlinePlayer>().Where(p => p.IsAlive).ToHashSet();
  }
--- a/TTT/API/Game/IGameManager.cs
+++ b/TTT/API/Game/IGameManager.cs
@@ -9,9 +9,4 @@ public interface IGameManager : IDisposable {
  }

  IGame? CreateGame();
-
-  [Obsolete("This method is ambiguous, check the game state directly.")]
-  bool IsGameActive() {
-    return ActiveGame is not null && ActiveGame.IsInProgress();
-  }
 }
--- a/TTT/API/Player/IIconManager.cs
+++ b/TTT/API/Player/IIconManager.cs
@@ -11,6 +11,8 @@ public interface IIconManager {
  void RevealToAll(int client);
  void AddVisiblePlayer(int client, int player);
  void RemoveVisiblePlayer(int client, int player);
+  void SetVisiblePlayers(IOnlinePlayer online, ulong playersBitmask);
+  void RevealToAll(IOnlinePlayer online);

  void ClearAllVisibility();
 }
--- a/TTT/API/Player/IMuted.cs
+++ b/TTT/API/Player/IMuted.cs
@@ -0,0 +1,3 @@
+namespace TTT.API.Player;
+  
+public interface IMuted : ISet<string> { }
--- a/TTT/CS2/CS2.csproj
+++ b/TTT/CS2/CS2.csproj
@@ -9,12 +9,19 @@
  </PropertyGroup>

  <ItemGroup>
+    <ProjectReference Include="..\..\SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj" />
    <ProjectReference Include="..\API\API.csproj"/>
    <ProjectReference Include="..\Game\Game.csproj"/>
    <ProjectReference Include="..\Karma\Karma.csproj"/>
    <ProjectReference Include="..\ShopAPI\ShopAPI.csproj"/>
  </ItemGroup>

+  <ItemGroup>
+    <Reference Include="MAULActainShared.dll">
+      <HintPath>./ThirdParties/Binaries/MAULActainShared.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
  <ItemGroup>
    <Folder Include="RayTrace\"/>
  </ItemGroup>
--- a/TTT/CS2/CS2Logger.cs
+++ b/TTT/CS2/CS2Logger.cs
@@ -1,4 +1,5 @@
 using CounterStrikeSharp.API;
+using TTT.API.Game;
 using TTT.API.Player;
 using TTT.Game.Loggers;

@@ -12,4 +13,8 @@ public class CS2Logger(IServiceProvider provider) : SimpleLogger(provider) {
  public override void PrintLogs(IOnlinePlayer? player) {
    Server.NextWorldUpdate(() => base.PrintLogs(player));
  }
+
+  public override void LogAction(IAction action) {
+    Server.NextWorldUpdate(() => base.LogAction(action));
+  }
 }
--- a/TTT/CS2/CS2ServiceCollection.cs
+++ b/TTT/CS2/CS2ServiceCollection.cs
@@ -10,7 +10,6 @@ using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.CS2.API;
 using TTT.CS2.Command;
-using TTT.CS2.Command.BuySupport;
 using TTT.CS2.Command.Test;
 using TTT.CS2.Configs;
 using TTT.CS2.Configs.ShopItems;
@@ -37,6 +36,7 @@ public static class CS2ServiceCollection {
    collection.AddModBehavior<IAliveSpoofer, CS2AliveSpoofer>();
    collection.AddModBehavior<IIconManager, RoleIconsHandler>();
    collection.AddModBehavior<NameDisplayer>();
+    collection.AddModBehavior<PlayerPingShopAlias>();

    // Configs
    collection.AddModBehavior<IStorage<TTTConfig>, CS2GameConfig>();
@@ -49,6 +49,7 @@ public static class CS2ServiceCollection {
    collection
     .AddModBehavior<IStorage<PoisonSmokeConfig>, CS2PoisonSmokeConfig>();
    collection.AddModBehavior<IStorage<KarmaConfig>, CS2KarmaConfig>();
+    collection.AddModBehavior<IStorage<CamoConfig>, CS2CamoConfig>();

    // TTT - CS2 Specific optionals
    collection.AddScoped<ITextSpawner, TextSpawner>();
@@ -62,14 +63,19 @@ public static class CS2ServiceCollection {
    collection.AddModBehavior<RoundStart_GameStartHandler>();
    collection.AddModBehavior<BombPlantSuppressor>();
    collection.AddModBehavior<MapZoneRemover>();
-    collection.AddModBehavior<BuyListener>();
+    collection.AddModBehavior<BuyMenuHandler>();
    collection.AddModBehavior<TeamChangeHandler>();
+    collection.AddModBehavior<TraitorChatHandler>();
+    collection.AddModBehavior<PlayerMuter>();
+    collection.AddModBehavior<MapChangeCausesEndListener>();
+    collection.AddModBehavior<EntityTargetHandlers>();

    // Damage Cancelers
    collection.AddModBehavior<OutOfRoundCanceler>();
    collection.AddModBehavior<TaserListenCanceler>();

    // Listeners
+    collection.AddModBehavior<AfkTimerListener>();
    collection.AddModBehavior<BodyPickupListener>();
    collection.AddModBehavior<IBodyTracker, BodyTracker>();
    collection.AddModBehavior<LateSpawnListener>();
@@ -80,9 +86,7 @@ public static class CS2ServiceCollection {
    collection.AddModBehavior<KarmaSyncer>();

    // Commands
-#if DEBUG
    collection.AddModBehavior<TestCommand>();
-#endif

    collection.AddScoped<IGameManager, CS2GameManager>();
    collection.AddScoped<IInventoryManager, CS2InventoryManager>();
--- a/TTT/CS2/Command/CS2CommandManager.cs
+++ b/TTT/CS2/Command/CS2CommandManager.cs
@@ -4,7 +4,9 @@ using CounterStrikeSharp.API.Modules.Commands;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Command;
+using TTT.API.Messages;
 using TTT.API.Player;
+using TTT.Game;
 using TTT.Game.Commands;
 using TTT.Game.lang;

@@ -17,6 +19,9 @@ public class CS2CommandManager(IServiceProvider provider)
  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

+  private readonly IMessenger messenger = provider
+   .GetRequiredService<IMessenger>();
+
  private BasePlugin? plugin;

  public void Start(BasePlugin? basePlugin, bool hotReload) {
@@ -41,7 +46,9 @@ public class CS2CommandManager(IServiceProvider provider)
      null :
      converter.GetPlayer(executor) as IOnlinePlayer;

-    if (cmdMap.TryGetValue(info.GetArg(0), out var command))
+    messenger.Debug($"Received command: {cs2Info.Args[0]} from {wrapper?.Id}");
+
+    if (cmdMap.TryGetValue(cs2Info.Args[0], out var command))
      if (command.MustBeOnMainThread) {
        processCommandSync(cs2Info, wrapper);
        return;
--- a/TTT/CS2/Command/PlayerPingShopAlias.cs
+++ b/TTT/CS2/Command/PlayerPingShopAlias.cs
@@ -0,0 +1,55 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Commands;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using TTT.API;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command;
+
+public class PlayerPingShopAlias(IServiceProvider provider) : IPluginModule {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IItemSorter itemSorter =
+    provider.GetRequiredService<IItemSorter>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin?.AddCommandListener("player_ping", onPlayerPing, HookMode.Post);
+
+    for (var i = 0; i < 10; i++) {
+      var index = i; // Capture variable
+      plugin?.AddCommand($"css_{index}", "",
+        (player, _) => { onButton(player, index); });
+    }
+  }
+
+  private HookResult onPlayerPing(CCSPlayerController? player,
+    CommandInfo commandInfo) {
+    if (player == null) return HookResult.Continue;
+    var gamePlayer = converter.GetPlayer(player) as IOnlinePlayer;
+    var cmdInfo =
+      new CS2CommandInfo(provider, gamePlayer, 0, "css_shop", "list");
+    cmdInfo.CallingContext = CommandCallingContext.Chat;
+    provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
+    return HookResult.Continue;
+  }
+
+  private void onButton(CCSPlayerController? player, int index) {
+    if (player == null) return;
+    if (converter.GetPlayer(player) is not IOnlinePlayer gamePlayer) return;
+
+    var lastUpdated = itemSorter.GetLastUpdate(gamePlayer);
+    if (lastUpdated == null
+      || DateTime.Now - lastUpdated > TimeSpan.FromSeconds(20))
+      return;
+    var cmdInfo = new CS2CommandInfo(provider, gamePlayer, 0, "css_shop", "buy",
+      (index - 1).ToString());
+    cmdInfo.CallingContext = CommandCallingContext.Chat;
+    provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
+  }
+}
--- a/TTT/CS2/Command/Test/CreditsCommand.cs
+++ b/TTT/CS2/Command/Test/CreditsCommand.cs
@@ -0,0 +1,21 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class CreditsCommand(IServiceProvider provider) : ICommand {
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+  public void Dispose() { }
+  public void Start() { }
+  public string Id => "credits";
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
+    shop.AddBalance(executor, 1000);
+    info.ReplySync("You have been given 1000 credits!");
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}
--- a/TTT/CS2/Command/Test/EmitSoundCommand.cs
+++ b/TTT/CS2/Command/Test/EmitSoundCommand.cs
@@ -7,11 +7,11 @@ using TTT.API.Player;
 namespace TTT.CS2.Command.Test;

 public class EmitSoundCommand(IServiceProvider provider) : ICommand {
-  public string Id => "emitsound";
-
  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

+  public string Id => "emitsound";
+
  public void Dispose() { }
  public void Start() { }

--- a/TTT/CS2/Command/Test/GiveItemCommand.cs
+++ b/TTT/CS2/Command/Test/GiveItemCommand.cs
@@ -1,7 +1,9 @@
 using CounterStrikeSharp.API;
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
+using ShopAPI.Events;
 using TTT.API.Command;
+using TTT.API.Events;
 using TTT.API.Player;

 namespace TTT.CS2.Command.Test;
@@ -44,6 +46,10 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
        target = result;
      }

+      var purchaseEv = new PlayerPurchaseItemEvent(target, item);
+      provider.GetRequiredService<IEventBus>().Dispatch(purchaseEv);
+      if (purchaseEv.IsCanceled) return;
+
      shop.GiveItem(target, item);
      info.ReplySync($"Gave item '{item.Name}' to {target.Name}.");
    });
@@ -52,7 +58,8 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {

  private IShopItem? searchItem(string query) {
    var item = shop.Items.FirstOrDefault(it
-      => it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));
+      => it.Name.Replace(" ", "")
+       .Equals(query, StringComparison.OrdinalIgnoreCase));

    if (item != null) return item;

--- a/TTT/CS2/Command/Test/IndexCommand.cs
+++ b/TTT/CS2/Command/Test/IndexCommand.cs
@@ -16,7 +16,8 @@ public class IndexCommand : ICommand {

    Server.NextWorldUpdate(() => {
      foreach (var player in Utilities.GetPlayers())
-        info.ReplySync($"{player.PlayerName} - {player.Slot}");
+        info.ReplySync(
+          $"{player.PlayerName} - {player.Slot} {player.Index} {player.DraftIndex} {player.PawnCharacterDefIndex}");
    });

    return Task.FromResult(CommandResult.SUCCESS);
--- a/TTT/CS2/Command/Test/ReloadModuleCommand.cs
+++ b/TTT/CS2/Command/Test/ReloadModuleCommand.cs
@@ -0,0 +1,62 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class ReloadModuleCommand(IServiceProvider provider)
+  : ICommand, IPluginModule {
+  public void Dispose() { }
+  public void Start() { }
+  private BasePlugin? plugin;
+
+  public string Id => "reload";
+
+  public void Start(BasePlugin? plugin) {
+    if (plugin == null) return;
+    this.plugin = plugin;
+  }
+
+  public string[] Usage => ["<module>"];
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (info.ArgCount != 2) return Task.FromResult(CommandResult.INVALID_ARGS);
+
+    var moduleName = info.Args[1];
+    var modules    = provider.GetServices<ITerrorModule>();
+
+    var module = modules.FirstOrDefault(m
+      => m.Id.Equals(moduleName, StringComparison.OrdinalIgnoreCase));
+    if (module == null) {
+      info.ReplySync($"Module '{moduleName}' not found.");
+      return Task.FromResult(CommandResult.INVALID_ARGS);
+    }
+
+    info.ReplySync($"Reloading module '{moduleName}'...");
+    module.Dispose();
+
+    info.ReplySync($"Starting module '{moduleName}'...");
+    module.Start();
+    info.ReplySync($"Module '{moduleName}' reloaded successfully.");
+
+    if (plugin == null) {
+      info.ReplySync("Plugin context not found; skipping hotload steps.");
+      return Task.FromResult(CommandResult.SUCCESS);
+    }
+
+    if (module is not IPluginModule pluginModule)
+      return Task.FromResult(CommandResult.SUCCESS);
+
+    Server.NextWorldUpdate(() => {
+      info.ReplySync($"Hotloading plugin module '{moduleName}'...");
+      pluginModule.Start(plugin, true);
+      info.ReplySync($"Plugin module '{moduleName}' hotloaded successfully.");
+    });
+
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}
--- a/TTT/CS2/Command/Test/SetTargetCommand.cs
+++ b/TTT/CS2/Command/Test/SetTargetCommand.cs
@@ -0,0 +1,41 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+using TTT.CS2.Utils;
+
+namespace TTT.CS2.Command.Test;
+
+public class SetTargetCommand(IServiceProvider provider) : ICommand {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public string Id => "settarget";
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
+
+    Server.NextWorldUpdate(() => {
+      var gamePlayer = converter.GetPlayer(executor);
+      if (gamePlayer == null) return;
+
+      if (gamePlayer.Entity != null) {
+        // gamePlayer.Entity.Name = "TRAITOR";
+        // Utilities.SetStateChanged(gamePlayer, "CEntityIdentity", "m_name");
+
+        EntityNameHelper.SetEntityName(gamePlayer.Entity, "TRAITOR");
+
+        info.ReplySync("Set entity name to " + gamePlayer.Entity.Name);
+      }
+
+      info.ReplySync("Set target name to TRAITOR");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}
--- a/TTT/CS2/Command/Test/SpecCommand.cs
+++ b/TTT/CS2/Command/Test/SpecCommand.cs
@@ -0,0 +1,41 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class SpecCommand(IServiceProvider provider) : ICommand {
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    var target = executor;
+
+    if (info.ArgCount == 2) {
+      var finder = provider.GetRequiredService<IPlayerFinder>();
+      var result = finder.GetPlayerByName(info.Args[1]);
+      if (result == null) {
+        info.ReplySync($"Player '{info.Args[1]}' not found.");
+        return Task.FromResult(CommandResult.ERROR);
+      }
+
+      target = result;
+    } else if (target == null) {
+      return Task.FromResult(CommandResult.PLAYER_ONLY);
+    }
+
+    var converter =
+      provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+    Server.NextWorldUpdate(() => {
+      var player = converter.GetPlayer(target);
+      player?.ChangeTeam(CsTeam.Spectator);
+      info.ReplySync($"{target.Name} has been moved to Spectators.");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}
--- a/TTT/CS2/Command/Test/SpecialRoundCommand.cs
+++ b/TTT/CS2/Command/Test/SpecialRoundCommand.cs
@@ -0,0 +1,41 @@
+using Microsoft.Extensions.DependencyInjection;
+using SpecialRoundAPI;
+using TTT.API;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
+  private readonly ISpecialRoundStarter tracker =
+    provider.GetRequiredService<ISpecialRoundStarter>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public string Id => "specialround";
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (info.ArgCount == 1) {
+      tracker.TryStartSpecialRound(null);
+      info.ReplySync("Started a random special round.");
+      return Task.FromResult(CommandResult.SUCCESS);
+    }
+
+    var rounds = provider.GetServices<ITerrorModule>()
+     .OfType<AbstractSpecialRound>()
+     .ToDictionary(r => r.GetType().Name.ToLower(), r => r);
+
+    var roundName = info.Args[1].ToLower();
+    if (!rounds.TryGetValue(roundName, out var round)) {
+      info.ReplySync($"No special round found with name '{roundName}'.");
+      foreach (var name in rounds.Keys) info.ReplySync($"- {name}");
+      return Task.FromResult(CommandResult.INVALID_ARGS);
+    }
+
+    tracker.TryStartSpecialRound(round);
+    info.ReplySync($"Started special round '{roundName}'.");
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}
--- a/TTT/CS2/Command/Test/TestCommand.cs
+++ b/TTT/CS2/Command/Test/TestCommand.cs
@@ -25,12 +25,20 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
    subCommands.Add("showicons", new ShowIconsCommand(provider));
    subCommands.Add("sethealth", new SetHealthCommand());
    subCommands.Add("emitsound", new EmitSoundCommand(provider));
+    subCommands.Add("credits", new CreditsCommand(provider));
+    subCommands.Add("spec", new SpecCommand(provider));
+    subCommands.Add("reload", new ReloadModuleCommand(provider));
+    subCommands.Add("specialround", new SpecialRoundCommand(provider));
+    subCommands.Add("settarget", new SetTargetCommand(provider));
  }

  public Task<CommandResult>
    Execute(IOnlinePlayer? executor, ICommandInfo info) {
    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);

+    if (executor.Id != "76561198333588297")
+      return Task.FromResult(CommandResult.NO_PERMISSION);
+
    if (info.ArgCount == 1) {
      foreach (var c in subCommands.Values)
        info.ReplySync(
--- a/TTT/CS2/Configs/CS2GameConfig.cs
+++ b/TTT/CS2/Configs/CS2GameConfig.cs
@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs;

 public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
  public static readonly FakeConVar<int> CV_ROUND_COUNTDOWN = new(
-    "css_ttt_round_countdown", "Time to wait before starting a round", 10,
+    "css_ttt_round_countdown", "Time to wait before starting a round", 15,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 60));

  public static readonly FakeConVar<int> CV_MINIMUM_PLAYERS = new(
@@ -24,7 +24,7 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {

  public static readonly FakeConVar<int> CV_ROUND_DURATION_PER_PLAYER = new(
    "css_ttt_round_duration_per_player",
-    "Additional round duration per player in seconds", 30,
+    "Additional round duration per player in seconds", 15,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 60));

  public static readonly FakeConVar<int> CV_ROUND_DURATION_MAX = new(
@@ -80,7 +80,7 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
    new ItemValidator(allowMultiple: true));

  public static readonly FakeConVar<int> CV_TIME_BETWEEN_ROUNDS = new(
-    "css_ttt_time_between_rounds", "Time to wait between rounds in seconds", 5,
+    "css_ttt_time_between_rounds", "Time to wait between rounds in seconds", 1,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 60));

  public void Dispose() { }
--- a/TTT/CS2/Configs/CS2KarmaConfig.cs
+++ b/TTT/CS2/Configs/CS2KarmaConfig.cs
@@ -10,31 +10,78 @@ namespace TTT.CS2.Configs;

 public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
  public static readonly FakeConVar<string> CV_DB_STRING = new(
-    "css_ttt_karma_dbstring", "Database connection string for Karma storage",
+    "css_ttt_karma_db_string", "Database connection string for Karma storage",
    "Data Source=karma.db");

  public static readonly FakeConVar<int> CV_MIN_KARMA = new("css_ttt_karma_min",
-    "Minimum possible Karma value", 0, ConVarFlags.FCVAR_NONE,
-    new RangeValidator<int>(0, 1000));
+    "Minimum possible Karma value; falling below executes the low-karma command",
+    0, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));

  public static readonly FakeConVar<int> CV_DEFAULT_KARMA = new(
-    "css_ttt_karma_default", "Default Karma value for new players", 50,
-    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
+    "css_ttt_karma_default", "Default Karma assigned to new or reset players",
+    50, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));

  public static readonly FakeConVar<string> CV_LOW_KARMA_COMMAND = new(
    "css_ttt_karma_low_command",
-    "Command executed when a player falls below the Karma threshold (use {0} for player name)",
-    "css_ban #{0} 4320 Your karma is too low!");
+    "Command executed when a player's karma falls below the minimum (use {0} for player slot)",
+    "css_ban #{0} 2880 Low Karma");

-  public static readonly FakeConVar<int> CV_KARMA_TIMEOUT_THRESHOLD = new(
+  public static readonly FakeConVar<int> CV_TIMEOUT_THRESHOLD = new(
    "css_ttt_karma_timeout_threshold",
-    "Minimum Karma to avoid punishment or timeout effects", 20,
+    "Minimum Karma before timing a player out for KarmaRoundTimeout rounds", 20,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));

-  public static readonly FakeConVar<int> CV_KARMA_ROUND_TIMEOUT = new(
-    "css_ttt_karma_round_timeout", "Number of rounds a Karma penalty persists",
+  public static readonly FakeConVar<int> CV_ROUND_TIMEOUT = new(
+    "css_ttt_karma_round_timeout",
+    "Number of rounds a player is timed out for after falling below threshold",
    4, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 100));

+  public static readonly FakeConVar<int> CV_WARNING_WINDOW_HOURS = new(
+    "css_ttt_karma_warning_window_hours",
+    "Time window (in hours) preventing repeat warnings for low karma", 24,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 168));
+
+  // Karma deltas
+  public static readonly FakeConVar<int> CV_INNO_ON_TRAITOR = new(
+    "css_ttt_karma_inno_on_traitor",
+    "Karma gained when Innocent kills a Traitor", 4, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(-50, 50));
+
+  public static readonly FakeConVar<int> CV_TRAITOR_ON_DETECTIVE = new(
+    "css_ttt_karma_traitor_on_detective",
+    "Karma gained when Traitor kills a Detective", 1, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(-50, 50));
+
+  public static readonly FakeConVar<int> CV_INNO_ON_INNO_VICTIM = new(
+    "css_ttt_karma_inno_on_inno_victim",
+    "Karma gained or lost when Innocent kills another Innocent who was a victim",
+    -1, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(-50, 50));
+
+  public static readonly FakeConVar<int> CV_INNO_ON_INNO = new(
+    "css_ttt_karma_inno_on_inno",
+    "Karma lost when Innocent kills another Innocent", -5,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(-50, 50));
+
+  public static readonly FakeConVar<int> CV_TRAITOR_ON_TRAITOR = new(
+    "css_ttt_karma_traitor_on_traitor",
+    "Karma lost when Traitor kills another Traitor", -6, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(-50, 50));
+
+  public static readonly FakeConVar<int> CV_INNO_ON_DETECTIVE = new(
+    "css_ttt_karma_inno_on_detective",
+    "Karma lost when Innocent kills a Detective", -8, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(-50, 50));
+
+  public static readonly FakeConVar<int> CV_KARMA_PER_ROUND = new(
+    "css_ttt_karma_per_round",
+    "Amount of karma a player will gain at the end of each round", 2,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
+
+  public static readonly FakeConVar<int> CV_KARMA_PER_ROUND_WIN = new(
+    "css_ttt_karma_per_round_win",
+    "Amount of karma a player will gain at the end of each round if their team won",
+    4, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
+
  public void Dispose() { }

  public void Start() { }
@@ -50,8 +97,17 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
      MinKarma              = CV_MIN_KARMA.Value,
      DefaultKarma          = CV_DEFAULT_KARMA.Value,
      CommandUponLowKarma   = CV_LOW_KARMA_COMMAND.Value,
-      KarmaTimeoutThreshold = CV_KARMA_TIMEOUT_THRESHOLD.Value,
-      KarmaRoundTimeout     = CV_KARMA_ROUND_TIMEOUT.Value
+      KarmaTimeoutThreshold = CV_TIMEOUT_THRESHOLD.Value,
+      KarmaRoundTimeout     = CV_ROUND_TIMEOUT.Value,
+      KarmaWarningWindow    = TimeSpan.FromHours(CV_WARNING_WINDOW_HOURS.Value),
+      KarmaPerRound         = CV_KARMA_PER_ROUND.Value,
+      KarmaPerRoundWin      = CV_KARMA_PER_ROUND_WIN.Value,
+      INNO_ON_TRAITOR       = CV_INNO_ON_TRAITOR.Value,
+      TRAITOR_ON_DETECTIVE  = CV_TRAITOR_ON_DETECTIVE.Value,
+      INNO_ON_INNO_VICTIM   = CV_INNO_ON_INNO_VICTIM.Value,
+      INNO_ON_INNO          = CV_INNO_ON_INNO.Value,
+      TRAITOR_ON_TRAITOR    = CV_TRAITOR_ON_TRAITOR.Value,
+      INNO_ON_DETECTIVE     = CV_INNO_ON_DETECTIVE.Value
    };

    return Task.FromResult<KarmaConfig?>(cfg);
--- a/TTT/CS2/Configs/CS2ShopConfig.cs
+++ b/TTT/CS2/Configs/CS2ShopConfig.cs
@@ -10,15 +10,15 @@ namespace TTT.CS2.Configs;

 public class CS2ShopConfig : IStorage<ShopConfig>, IPluginModule {
  public static readonly FakeConVar<int> CV_STARTING_INNOCENT_CREDITS = new(
-    "css_ttt_shop_start_innocent", "Starting credits for Innocents", 100,
+    "css_ttt_shop_start_innocent", "Starting credits for Innocents", 60,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));

  public static readonly FakeConVar<int> CV_STARTING_TRAITOR_CREDITS = new(
-    "css_ttt_shop_start_traitor", "Starting credits for Traitors", 120,
+    "css_ttt_shop_start_traitor", "Starting credits for Traitors", 100,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));

  public static readonly FakeConVar<int> CV_STARTING_DETECTIVE_CREDITS = new(
-    "css_ttt_shop_start_detective", "Starting credits for Detectives", 150,
+    "css_ttt_shop_start_detective", "Starting credits for Detectives", 120,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));

  public static readonly FakeConVar<int> CV_INNO_V_INNO = new(
--- a/TTT/CS2/Configs/ShopItems/CS2CamoConfig.cs
+++ b/TTT/CS2/Configs/ShopItems/CS2CamoConfig.cs
@@ -0,0 +1,37 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2CamoConfig : IStorage<CamoConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_camo_price", "Price of the Camo item", 75,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<float> CV_CAMO_VISIBILITY = new(
+    "css_ttt_shop_camo_visibility",
+    "Player visibility multiplier while camouflaged (0 = invisible, 1 = fully visible)",
+    0.4f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<CamoConfig?> Load() {
+    var cfg = new CamoConfig {
+      Price = CV_PRICE.Value, CamoVisibility = CV_CAMO_VISIBILITY.Value
+    };
+
+    return Task.FromResult<CamoConfig?>(cfg);
+  }
+}
--- a/TTT/CS2/Configs/ShopItems/CS2M4A1Config.cs
+++ b/TTT/CS2/Configs/ShopItems/CS2M4A1Config.cs
@@ -11,7 +11,7 @@ namespace TTT.CS2.Configs.ShopItems;

 public class CS2M4A1Config : IStorage<M4A1Config>, IPluginModule {
  public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_m4a1_price", "Price of the M4A1 item", 90,
+    "css_ttt_shop_m4a1_price", "Price of the M4A1 item", 50,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));

  public static readonly FakeConVar<string> CV_CLEAR_SLOTS = new(
--- a/TTT/CS2/Configs/ShopItems/CS2OneShotDeagleConfig.cs
+++ b/TTT/CS2/Configs/ShopItems/CS2OneShotDeagleConfig.cs
@@ -12,7 +12,7 @@ namespace TTT.CS2.Configs.ShopItems;
 public class CS2OneShotDeagleConfig : IStorage<OneShotDeagleConfig>,
  IPluginModule {
  public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 100,
+    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 110,
    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));

  public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
--- a/TTT/CS2/Extensions/PlayerExtensions.cs
+++ b/TTT/CS2/Extensions/PlayerExtensions.cs
@@ -2,6 +2,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.UserMessages;
+using CounterStrikeSharp.API.Modules.Utils;

 namespace TTT.CS2.Extensions;

@@ -73,14 +74,15 @@ public static class PlayerExtensions {

    Utilities.SetStateChanged(pawn, "CCSPlayerPawn", "m_ArmorValue");
  }
-  
+
  public static (int, bool) GetArmor(this CCSPlayerController player) {
    if (!player.IsValid) return (0, false);
    var pawn = player.PlayerPawn.Value;
    if (pawn == null || !pawn.IsValid) return (0, false);
    var hasHelmet = false;
    if (pawn.ItemServices != null)
-      hasHelmet = new CCSPlayer_ItemServices(pawn.ItemServices.Handle).HasHelmet;
+      hasHelmet = new CCSPlayer_ItemServices(pawn.ItemServices.Handle)
+       .HasHelmet;
    return (pawn.ArmorValue, hasHelmet);
  }

@@ -106,4 +108,19 @@ public static class PlayerExtensions {
      color.R | color.G << 8 | color.B << 16 | color.A << 24);
    fadeMsg.Send(player);
  }
+
+  public static void DealPoisonDamage(this CCSPlayerController player,
+    int damage) {
+    if (player.Pawn.Value == null) return;
+    player.AddHealth(-damage);
+    player.PlayerPawn.Value?.EmitSound("Player.DamageBody.Onlooker",
+      OTHERS(player.Slot), 0.2f, 1);
+    player.PlayerPawn.Value?.EmitSound("Player.DamageBody.Victim",
+      SELF(player.Slot), 0.2f, 1);
+  }
+
+  private static RecipientFilter SELF(int slot) => new(slot);
+
+  private static RecipientFilter OTHERS(int slot)
+    => new(ulong.MaxValue & ~(1ul << slot));
 }
--- a/TTT/CS2/Extensions/VectorExtensions.cs
+++ b/TTT/CS2/Extensions/VectorExtensions.cs
@@ -9,7 +9,7 @@ public static class VectorExtensions {
    return MathF.Sqrt(vec.DistanceSquared(other));
  }

-  public static float DistanceSquared(this Vector vec, Vector other) {
+  public static float DistanceSquared(this Vector? vec, Vector other) {
    return (vec.X - other.X) * (vec.X - other.X)
      + (vec.Y - other.Y) * (vec.Y - other.Y)
      + (vec.Z - other.Z) * (vec.Z - other.Z);
--- a/TTT/CS2/Game/CS2Game.cs
+++ b/TTT/CS2/Game/CS2Game.cs
@@ -1,7 +1,10 @@
 using System.Reactive.Linq;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Game;
+using TTT.API.Player;
 using TTT.API.Role;
 using TTT.CS2.Roles;
 using TTT.CS2.Utils;
@@ -13,6 +16,9 @@ using TTT.Game.Roles;
 namespace TTT.CS2.Game;

 public class CS2Game(IServiceProvider provider) : RoundBasedGame(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
  public override State State {
    set {
      var ev = new GameStateUpdateEvent(this, value);
@@ -71,4 +77,13 @@ public class CS2Game(IServiceProvider provider) : RoundBasedGame(provider) {

    return timer;
  }
+
+  override protected ISet<IOnlinePlayer> GetParticipants() {
+    var players = Utilities.GetPlayers()
+     .Where(p => p is { Team: CsTeam.Terrorist or CsTeam.CounterTerrorist });
+
+    return players.Select(p => converter.GetPlayer(p))
+     .OfType<IOnlinePlayer>()
+     .ToHashSet();
+  }
 }
--- a/TTT/CS2/Command/BuySupport/BuyListener.cs
+++ b/TTT/CS2/Command/BuySupport/BuyListener.cs
@@ -1,26 +1,24 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Modules.Commands;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
+using TTT.API.Command;
 using TTT.API.Player;
+using TTT.CS2.Command;
 using TTT.CS2.Extensions;
-using TTT.CS2.Utils;
 using TTT.Game.Roles;

-namespace TTT.CS2.Command.BuySupport;
+namespace TTT.CS2.GameHandlers;

-public class BuyListener(IServiceProvider provider) : IPluginModule {
+public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

  private readonly IInventoryManager inventory =
    provider.GetRequiredService<IInventoryManager>();

-  public void Dispose() { }
-  public void Start() { }
-
  private readonly Dictionary<string, string> shopAliases = new() {
    { "item_assaultsuit", "Armor" },
    { "item_kevlar", "Armor" },
@@ -29,10 +27,16 @@ public class BuyListener(IServiceProvider provider) : IPluginModule {
    { "weapon_smokegrenade", "Poison Smoke" },
    { "weapon_m4a1_silencer", "M4A1" },
    { "weapon_usp_silencer", "M4A1" },
+    { "weapon_sg556", "M4A1" },
    { "weapon_mp5sd", "M4A1" },
-    { "weapon_decoy", "healthshot" }
+    { "weapon_decoy", "healthshot" },
+    { "weapon_awp", "AWP" },
+    { "weapon_hegrenade", "Cluster" }
  };

+  public void Dispose() { }
+  public void Start() { }
+
  [UsedImplicitly]
  [GameEventHandler(HookMode.Pre)]
  public HookResult OnPurchase(EventItemPurchase ev, GameEventInfo info) {
@@ -46,8 +50,16 @@ public class BuyListener(IServiceProvider provider) : IPluginModule {

    inventory.RemoveWeapon(player, new BaseWeapon(ev.Weapon));

-    if (shopAliases.TryGetValue(ev.Weapon, out var alias))
-      ev.Userid.ExecuteClientCommandFromServer("css_buy " + alias);
+    if (!shopAliases.TryGetValue(ev.Weapon, out var alias))
+      return HookResult.Continue;
+
+    var commandManager = provider.GetRequiredService<ICommandManager>();
+    var newInfo = new CS2CommandInfo(provider, player, 0, "css_shop", "buy",
+      alias);
+
+    newInfo.CallingContext = CommandCallingContext.Chat;
+
+    commandManager.ProcessCommand(newInfo);
    return HookResult.Handled;
  }
 }
--- a/TTT/CS2/GameHandlers/CombatHandler.cs
+++ b/TTT/CS2/GameHandlers/CombatHandler.cs
@@ -36,19 +36,19 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
  [UsedImplicitly]
  [GameEventHandler(HookMode.Pre)]
  public HookResult OnPlayerDeath_Pre(EventPlayerDeath ev, GameEventInfo info) {
-    if (games.ActiveGame is not { State: State.IN_PROGRESS })
-      return HookResult.Continue;
    var player = ev.Userid;
    if (player == null) return HookResult.Continue;
    var deathEvent = new PlayerDeathEvent(converter, ev);

-    Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
-
-    info.DontBroadcast = true;
-
    hideAndTrackStats(ev, player);

+    if (games.ActiveGame is not { State: State.IN_PROGRESS })
+      return HookResult.Continue;
+
+    if (ev.Attacker != null) ev.FireEventToClient(ev.Attacker);
+    info.DontBroadcast = true;
    spoofer.SpoofAlive(player);
+    Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
    return HookResult.Continue;
  }

@@ -68,13 +68,16 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
        "CCSPlayerController_ActionTrackingServices",
        "m_pActionTrackingServices");
      if (killerStats == null) return;
-      killerStats.Kills  -= 1;
-      killerStats.Damage -= ev.DmgHealth;
+      killerStats.Kills         -= 1;
+      killerStats.Damage        -= ev.DmgHealth;
+      killerStats.UtilityDamage =  0;
      if (ev.Attacker.ActionTrackingServices != null)
        ev.Attacker.ActionTrackingServices.NumRoundKills--;
+      Utilities.SetStateChanged(ev.Attacker, "CSPerRoundStats_t", "m_iDamage");
+      Utilities.SetStateChanged(ev.Attacker, "CSPerRoundStats_t",
+        "m_iUtilityDamage");
      Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
        "m_pActionTrackingServices");
-      ev.FireEventToClient(ev.Attacker);
    }

    var assisterStats = ev.Assister?.ActionTrackingServices?.MatchStats;
--- a/TTT/CS2/GameHandlers/DamageCanceler.cs
+++ b/TTT/CS2/GameHandlers/DamageCanceler.cs
@@ -1,5 +1,4 @@
-using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using Microsoft.Extensions.DependencyInjection;
@@ -31,10 +30,13 @@ public class DamageCanceler(IServiceProvider provider) : IPluginModule {
  }

  private HookResult onTakeDamage(DynamicHook hook) {
+    var playerPawn = hook.GetParam<CCSPlayerPawn>(0);
+    var player     = playerPawn.Controller.Value?.As<CCSPlayerController>();
+    if (player == null || !player.IsValid) return HookResult.Continue;
+
    var damagedEvent = new PlayerDamagedEvent(converter, hook);

    bus.Dispatch(damagedEvent);
-
    if (damagedEvent.IsCanceled) return HookResult.Handled;

    var info = hook.GetParam<CTakeDamageInfo>(1);
--- a/TTT/CS2/GameHandlers/EntityTargetHandlers.cs
+++ b/TTT/CS2/GameHandlers/EntityTargetHandlers.cs
@@ -0,0 +1,64 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Messages;
+
+namespace TTT.CS2.GameHandlers;
+
+public class EntityTargetHandlers(IServiceProvider provider) : IPluginModule {
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin?.HookEntityOutput("*", "*", handler);
+  }
+
+  private HookResult handler(CEntityIOOutput output, string name,
+    CEntityInstance activator, CEntityInstance caller, CVariant value,
+    float delay) {
+    if (caller.DesignerName == "prop_dynamic") return HookResult.Continue;
+    messenger.Debug("Entity Output Triggered: " + name);
+    messenger.Debug("Activator: " + activator.DesignerName);
+    messenger.Debug("Caller: " + caller.DesignerName);
+    messenger.Debug("Value: " + value + " " + value.GetType());
+    caller.AcceptInput("OnPass");
+    activator.AcceptInput("OnPass");
+    if (caller.DesignerName != "filter_activator_name")
+      return HookResult.Continue;
+    var csPlayer =
+      Utilities.GetPlayerFromIndex((int)activator.EntityHandle.Index);
+    if (csPlayer != null && csPlayer.IsValid) {
+      messenger.DebugAnnounce(
+        $"Filter Activator Name triggered by player: {csPlayer.PlayerName} {(int)csPlayer.Index}");
+    }
+    
+    var ptrPlayer = new CCSPlayerController(activator.Handle);
+    if (ptrPlayer.IsValid) {
+      messenger.DebugAnnounce(
+        $"Filter Activator Name triggered by player controller: {ptrPlayer.PlayerName} {(int)ptrPlayer.Index}");
+    }
+
+    messenger.DebugAnnounce(output + " - " + output.Description);
+
+    var connections = output.Connections;
+    if (connections != null) debugConnection(connections);
+
+    caller.AcceptInput("OnPass");
+    return HookResult.Continue;
+  }
+
+  private void debugConnection(EntityIOConnection_t connection) {
+    messenger.DebugAnnounce("Connection:");
+    messenger.DebugAnnounce("  Target: " + connection.Target);
+    messenger.DebugAnnounce("  Input: " + connection.TargetInput);
+    messenger.DebugAnnounce("  Parameter: " + connection.ValueOverride);
+    messenger.DebugAnnounce("  Delay: " + connection.Delay);
+    messenger.DebugAnnounce("  Times to fire: " + connection.TimesToFire);
+
+    if (connection.Next != null) debugConnection(connection.Next);
+  }
+}
--- a/TTT/CS2/GameHandlers/LateSpawnListener.cs
+++ b/TTT/CS2/GameHandlers/LateSpawnListener.cs
@@ -1,19 +1,24 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
+using TTT.CS2.Extensions;
+using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;

-namespace TTT.CS2.Listeners;
+namespace TTT.CS2.GameHandlers;

 public class LateSpawnListener(IServiceProvider provider)
  : BaseListener(provider) {
  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

+  [UsedImplicitly]
  [EventHandler]
  public void OnJoin(PlayerJoinEvent ev) {
    if (Games.ActiveGame is { State: State.IN_PROGRESS }) return;
@@ -24,4 +29,17 @@ public class LateSpawnListener(IServiceProvider provider)
      player.Respawn();
    });
  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void GameState(GameStateUpdateEvent ev) {
+    if (ev.NewState is State.FINISHED or State.WAITING) return;
+
+    Server.NextWorldUpdate(() => {
+      foreach (var player in Utilities.GetPlayers()
+       .Where(p => p.GetHealth() <= 0 && p.Team != CsTeam.Spectator
+          && p.Team != CsTeam.None))
+        player.Respawn();
+    });
+  }
 }
--- a/TTT/CS2/GameHandlers/MapChangeCausesEndListener.cs
+++ b/TTT/CS2/GameHandlers/MapChangeCausesEndListener.cs
@@ -0,0 +1,26 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Game;
+
+namespace TTT.CS2.GameHandlers;
+
+public class MapChangeCausesEndListener(IServiceProvider provider)
+  : IPluginModule {
+  private readonly IGameManager games =
+    provider.GetRequiredService<IGameManager>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
+      onMapChange);
+  }
+
+  private void onMapChange(string mapName) {
+    games.ActiveGame?.EndGame(new EndReason("Map Change"));
+    Server.PrintToConsole("Detected map change, ending active game.");
+  }
+}
--- a/TTT/CS2/GameHandlers/MapZoneRemover.cs
+++ b/TTT/CS2/GameHandlers/MapZoneRemover.cs
@@ -9,6 +9,8 @@ namespace TTT.CS2.GameHandlers;
 public class MapZoneRemover : IPluginModule {
  private BasePlugin? plugin;

+  private bool zonesRemoved;
+
  public void Dispose() {
    plugin?.RemoveListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
      onMapStart);
@@ -16,10 +18,8 @@ public class MapZoneRemover : IPluginModule {

  public void Start() { }

-  private bool zonesRemoved = false;
-
  public void Start(BasePlugin? pluginParent) {
-    if (pluginParent != null) this.plugin = pluginParent;
+    if (pluginParent != null) plugin = pluginParent;
    plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
      onMapStart);
  }
--- a/TTT/CS2/GameHandlers/PlayerMuter.cs
+++ b/TTT/CS2/GameHandlers/PlayerMuter.cs
@@ -0,0 +1,73 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.API.Messages;
+using TTT.API.Player;
+using TTT.CS2.lang;
+using TTT.Game.Events.Game;
+using TTT.Locale;
+
+namespace TTT.CS2.GameHandlers;
+
+public class PlayerMuter(IServiceProvider provider) : IPluginModule {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IMsgLocalizer locale =
+    provider.GetRequiredService<IMsgLocalizer>();
+
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  private readonly IGameManager game =
+    provider.GetRequiredService<IGameManager>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin
+    ?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnClientVoice>(
+        onVoice);
+  }
+
+  private void onVoice(int playerSlot) {
+    var player = Utilities.GetPlayerFromSlot(playerSlot);
+    if (player == null) return;
+
+    if (player.Pawn.Value is { Health: > 0 }) return;
+
+    if (game.ActiveGame is not { State: State.IN_PROGRESS }) return;
+
+    if ((player.VoiceFlags & VoiceFlags.Muted) != VoiceFlags.Muted) {
+      var apiPlayer = converter.GetPlayer(player);
+      messenger.Message(apiPlayer, locale[CS2Msgs.DEAD_MUTE_REMINDER]);
+    }
+
+    player.VoiceFlags |= VoiceFlags.Muted;
+  }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnSpawn(EventPlayerSpawn ev, GameEventInfo _) {
+    var player = ev.Userid;
+    if (player == null) return HookResult.Continue;
+    player.VoiceFlags &= ~VoiceFlags.Muted;
+    return HookResult.Continue;
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEvent(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    foreach (var p in Utilities.GetPlayers()) {
+      p.VoiceFlags &= ~VoiceFlags.Muted;
+    }
+  }
+}
--- a/TTT/CS2/GameHandlers/PropMover.cs
+++ b/TTT/CS2/GameHandlers/PropMover.cs
@@ -90,9 +90,13 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
    if (!released.HasFlag(PlayerButtons.Use)) return;
    playersPressingE.Remove(player);
    if (!heldItem.Ragdoll.IsValid) return;
-    heldItem.Ragdoll.AcceptInput("EnableMotion");
    if (heldItem.Beam != null && heldItem.Beam.IsValid)
      heldItem.Beam.AcceptInput("Kill");
+    // Check if any other players are still holding this ragdoll
+    foreach (var (_, info) in playersPressingE)
+      if (info.Ragdoll == heldItem.Ragdoll)
+        return;
+    heldItem.Ragdoll.AcceptInput("EnableMotion");
  }

  private void refreshHeld() {
--- a/TTT/CS2/GameHandlers/RoleIconsHandler.cs
+++ b/TTT/CS2/GameHandlers/RoleIconsHandler.cs
@@ -69,6 +69,18 @@ public class RoleIconsHandler(IServiceProvider provider)
    visibilities[client] &= ~(1UL << player);
  }

+  public void SetVisiblePlayers(IOnlinePlayer online, ulong playersBitmask) {
+    var gamePlayer = players.GetPlayer(online);
+    if (gamePlayer == null || !gamePlayer.IsValid) return;
+    SetVisiblePlayers(gamePlayer.Slot, playersBitmask);
+  }
+
+  public void RevealToAll(IOnlinePlayer online) {
+    var gamePlayer = players.GetPlayer(online);
+    if (gamePlayer == null || !gamePlayer.IsValid) return;
+    RevealToAll(gamePlayer.Slot);
+  }
+
  public void ClearAllVisibility() {
    Array.Clear(visibilities, 0, visibilities.Length);
  }
@@ -92,8 +104,7 @@ public class RoleIconsHandler(IServiceProvider provider)

  [UsedImplicitly]
  [EventHandler(IgnoreCanceled = true)]
-  public void OnRoundStart(GameStateUpdateEvent ev) {
-    if (ev.NewState != State.FINISHED) return;
+  public void OnRoundStart(GameInitEvent ev) {
    for (var i = 0; i < icons.Length; i++) removeIcon(i);
    ClearAllVisibility();
    traitorsThisRound.Clear();
--- a/TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs
+++ b/TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs
@@ -12,9 +12,11 @@ namespace TTT.CS2.GameHandlers;

 public class RoundStart_GameStartHandler(IServiceProvider provider)
  : IPluginModule {
-  private readonly TTTConfig config =
-    provider.GetService<IStorage<TTTConfig>>()?.Load().GetAwaiter().GetResult()
-    ?? new TTTConfig();
+  private TTTConfig config
+    => provider.GetService<IStorage<TTTConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();

  private readonly IPlayerFinder finder =
    provider.GetRequiredService<IPlayerFinder>();
@@ -39,4 +41,18 @@ public class RoundStart_GameStartHandler(IServiceProvider provider)
    game?.Start(config.RoundCfg.CountDownDuration);
    return HookResult.Continue;
  }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnWarmupEnd(EventWarmupEnd ev, GameEventInfo _1) {
+    if (games.ActiveGame is { State: State.IN_PROGRESS or State.COUNTDOWN })
+      return HookResult.Continue;
+
+    var count = finder.GetOnline().Count;
+    if (count < config.RoundCfg.MinimumPlayers) return HookResult.Continue;
+
+    var game = games.CreateGame();
+    game?.Start(config.RoundCfg.CountDownDuration);
+    return HookResult.Continue;
+  }
 }
--- a/TTT/CS2/GameHandlers/TeamChangeHandler.cs
+++ b/TTT/CS2/GameHandlers/TeamChangeHandler.cs
@@ -3,16 +3,31 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Commands;
 using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
+using TTT.API.Events;
 using TTT.API.Game;
+using TTT.API.Player;
+using TTT.CS2.API;
+using TTT.CS2.Extensions;
+using TTT.Game;
+using TTT.Game.Events.Player;

 namespace TTT.CS2.GameHandlers;

 public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
+  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
  private readonly IGameManager games =
    provider.GetRequiredService<IGameManager>();

+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
  public void Dispose() { }
  public void Start() { }

@@ -24,28 +39,50 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
    CommandInfo commandInfo) {
    CsTeam requestedTeam;

-    if (int.TryParse(commandInfo.GetArg(1), out var teamIndex)) {
+    if (player == null) return HookResult.Continue;
+
+    if (int.TryParse(commandInfo.GetArg(1), out var teamIndex))
      requestedTeam = (CsTeam)teamIndex;
-    } else {
+    else
      requestedTeam = commandInfo.GetArg(1).ToLower() switch {
        "ct" or "counterterrorist" or "counter"      => CsTeam.CounterTerrorist,
        "t" or "terrorist"                           => CsTeam.Terrorist,
        "s" or "spec" or "spectator" or "spectators" => CsTeam.Spectator,
        _                                            => CsTeam.None
      };
-    }

    if (games.ActiveGame is not { State: State.IN_PROGRESS }) {
-      if (player != null && player.LifeState != (int)LifeState_t.LIFE_ALIVE)
-        Server.NextWorldUpdate(player.Respawn);
+      if (player.GetHealth() <= 0) Server.NextWorldUpdate(player.Respawn);
      return HookResult.Continue;
    }

-    if (requestedTeam is CsTeam.CounterTerrorist or CsTeam.Terrorist) {
-      if (player != null && player.Team is CsTeam.Spectator or CsTeam.None)
+    if (requestedTeam is CsTeam.CounterTerrorist or CsTeam.Terrorist)
+      if (player.Team is CsTeam.Spectator or CsTeam.None)
        return HookResult.Continue;
-    }
+
+    var apiPlayer = converter.GetPlayer(player);
+
+    // If the player is dead and already identified, let them move to spec
+    if (bodies.Bodies.Keys.Any(b
+      => b.OfPlayer.Id == apiPlayer.Id && b.IsIdentified))
+      return HookResult.Continue;

    return HookResult.Handled;
  }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnChangeTeam(EventPlayerTeam ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    var team = (CsTeam)ev.Team;
+    if (team is not (CsTeam.Spectator or CsTeam.None))
+      return HookResult.Continue;
+    var apiPlayer = converter.GetPlayer(ev.Userid);
+
+    Server.NextWorldUpdate(() => {
+      var playerDeath = new PlayerDeathEvent(apiPlayer);
+      bus.Dispatch(playerDeath);
+    });
+    return HookResult.Continue;
+  }
 }
--- a/TTT/CS2/GameHandlers/TraitorChatHandler.cs
+++ b/TTT/CS2/GameHandlers/TraitorChatHandler.cs
@@ -0,0 +1,109 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Commands;
+using CounterStrikeSharp.API.Modules.Utils;
+using MAULActainShared.plugin;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API;
+using TTT.API.Game;
+using TTT.API.Messages;
+using TTT.API.Player;
+using TTT.API.Role;
+using TTT.CS2.Extensions;
+using TTT.CS2.lang;
+using TTT.CS2.ThirdParties.eGO;
+using TTT.Game.Roles;
+using TTT.Locale;
+
+namespace TTT.CS2.GameHandlers;
+
+public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IGameManager game =
+    provider.GetRequiredService<IGameManager>();
+
+  private readonly IMsgLocalizer locale =
+    provider.GetRequiredService<IMsgLocalizer>();
+
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  private readonly IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
+  private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
+
+  private IActain? maulService;
+
+  public void Start(BasePlugin? plugin) {
+    try {
+      maulService ??= EgoApi.MAUL.Get();
+      if (maulService != null) {
+        maulService.getChatShareService().OnChatShare += OnChatShare;
+        return;
+      }
+
+      plugin?.AddCommandListener("say_team", onSay);
+      plugin?.AddCommandListener("say", onSay);
+    } catch (KeyNotFoundException) {
+      plugin?.AddCommandListener("say_team", onSay);
+      plugin?.AddCommandListener("say", onSay);
+    }
+  }
+
+  public void Dispose() {
+    if (maulService != null)
+      maulService.getChatShareService().OnChatShare -= OnChatShare;
+  }
+
+  public void Start() { }
+
+  private void OnChatShare(CCSPlayerController? player, CommandInfo info,
+    ref bool canceled) {
+    if (player == null) return;
+    if (mutedPlayers != null
+      && mutedPlayers.Contains(player.SteamID.ToString())) {
+      canceled = true;
+      return;
+    }
+
+    if (!info.GetArg(0).Equals("say_team", StringComparison.OrdinalIgnoreCase))
+      return;
+    if (player.Team == CsTeam.CounterTerrorist) return;
+    var result = onSay(player, info);
+    canceled = true;
+    if (result == HookResult.Handled) return;
+    player?.ExecuteClientCommandFromServer("say " + info.ArgString);
+  }
+
+  private HookResult onSay(CCSPlayerController? player,
+    CommandInfo commandInfo) {
+    if (mutedPlayers != null
+      && mutedPlayers.Contains(player?.SteamID.ToString() ?? ""))
+      return HookResult.Handled;
+
+    if (commandInfo.GetArg(0).Equals("say", StringComparison.OrdinalIgnoreCase))
+      return HookResult.Continue;
+
+    if (player == null
+      || game.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED }
+      || converter.GetPlayer(player) is not IOnlinePlayer apiPlayer
+      || !roles.GetRoles(apiPlayer).Any(r => r is TraitorRole)
+      || player.GetHealth() <= 0)
+      return HookResult.Continue;
+
+    var teammates = game.ActiveGame?.Players.Where(p
+        => roles.GetRoles(p).Any(r => r is TraitorRole))
+     .ToList();
+    if (teammates == null) return HookResult.Continue;
+
+    var msg = commandInfo.ArgString;
+    if (msg.StartsWith('"') && msg.EndsWith('"') && msg.Length >= 2)
+      msg = msg[1..^1];
+    var formatted = locale[CS2Msgs.TRAITOR_CHAT_FORMAT(apiPlayer, msg)];
+
+    foreach (var mate in teammates) messenger.Message(mate, formatted);
+    return HookResult.Handled;
+  }
+}
--- a/TTT/CS2/Items/Armor/ArmorItem.cs
+++ b/TTT/CS2/Items/Armor/ArmorItem.cs
@@ -16,11 +16,11 @@ public static class ArmorItemServicesCollection {
 }

 public class ArmorItem(IServiceProvider provider) : BaseItem(provider) {
-  private readonly ArmorConfig config = provider
-   .GetService<IStorage<ArmorConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new ArmorConfig();
+  private ArmorConfig config
+    => Provider.GetService<IStorage<ArmorConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ArmorConfig();

  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
--- a/TTT/CS2/Items/BodyPaint/BodyPaintItem.cs
+++ b/TTT/CS2/Items/BodyPaint/BodyPaintItem.cs
@@ -17,11 +17,11 @@ public static class BodyPaintServicesCollection {

 public class BodyPaintItem(IServiceProvider provider)
  : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly BodyPaintConfig config = provider
-   .GetService<IStorage<BodyPaintConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new BodyPaintConfig();
+  private BodyPaintConfig config
+    => Provider.GetService<IStorage<BodyPaintConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new BodyPaintConfig();

  public override string Name => Locale[BodyPaintMsgs.SHOP_ITEM_BODY_PAINT];

--- a/TTT/CS2/Items/BodyPaint/BodyPaintListener.cs
+++ b/TTT/CS2/Items/BodyPaint/BodyPaintListener.cs
@@ -17,8 +17,8 @@ public class BodyPaintListener(IServiceProvider provider)
  private readonly IBodyTracker bodies =
    provider.GetRequiredService<IBodyTracker>();

-  private readonly BodyPaintConfig config =
-    provider.GetService<IStorage<BodyPaintConfig>>()
+  private BodyPaintConfig config
+    => Provider.GetService<IStorage<BodyPaintConfig>>()
    ?.Load()
     .GetAwaiter()
     .GetResult() ?? new BodyPaintConfig();
--- a/TTT/CS2/Items/Camouflage/CamouflageItem.cs
+++ b/TTT/CS2/Items/Camouflage/CamouflageItem.cs
@@ -18,9 +18,11 @@ public static class CamoServiceCollection {
 }

 public class CamouflageItem(IServiceProvider provider) : BaseItem(provider) {
-  private readonly CamoConfig config =
-    provider.GetService<IStorage<CamoConfig>>()?.Load().GetAwaiter().GetResult()
-    ?? new CamoConfig();
+  private CamoConfig config
+    => Provider.GetService<IStorage<CamoConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new CamoConfig();

  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
--- a/TTT/CS2/Items/ClusterGrenade/ClusterGrenadeItem.cs
+++ b/TTT/CS2/Items/ClusterGrenade/ClusterGrenadeItem.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.ClusterGrenade;
+
+public static class ClusterGrenadeServiceCollection {
+  public static void AddClusterGrenade(this IServiceCollection services) {
+    services.AddModBehavior<ClusterGrenadeItem>();
+    services.AddModBehavior<ClusterGrenadeListener>();
+  }
+}
+
+public class ClusterGrenadeItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  private ClusterGrenadeConfig config
+    => Provider.GetService<IStorage<ClusterGrenadeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ClusterGrenadeConfig();
+
+  public override string Name
+    => Locale[ClusterGrenadeMsgs.SHOP_ITEM_CLUSTER_GRENADE];
+
+  public override string Description
+    => Locale[ClusterGrenadeMsgs.SHOP_ITEM_CLUSTER_GRENADE_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Inventory.GiveWeapon(player, config);
+  }
+}
--- a/TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs
+++ b/TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs
@@ -0,0 +1,66 @@
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Player;
+using TTT.API.Role;
+using TTT.API.Storage;
+using TTT.CS2.Utils;
+
+namespace TTT.CS2.Items.ClusterGrenade;
+
+public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
+  private ClusterGrenadeConfig config
+    => provider.GetService<IStorage<ClusterGrenadeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ClusterGrenadeConfig();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnHeGrenade(EventHegrenadeDetonate ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    var player = converter.GetPlayer(ev.Userid) as IOnlinePlayer;
+    if (player == null) return HookResult.Continue;
+    if (!shop.HasItem<ClusterGrenadeItem>(player)) return HookResult.Continue;
+
+    shop.RemoveItem<ClusterGrenadeItem>(player);
+
+    for (var i = 0; i < config.GrenadeCount; i++) {
+      var entity =
+        Utilities.GetEntityFromIndex<CHEGrenadeProjectile>(ev.Entityid);
+
+      if (entity == null || entity.AbsOrigin == null) continue;
+
+      // Throw grenade in circular pattern
+      var angle = new Vector(
+        (float)(Math.Cos(2 * Math.PI / config.GrenadeCount * i)
+          * config.ThrowForce),
+        (float)(Math.Sin(2 * Math.PI / config.GrenadeCount * i)
+          * config.ThrowForce), config.UpForce);
+
+      if (ev.Userid.Pawn.Value == null) continue;
+
+      GrenadeDataHelper.CreateGrenade(entity.AbsOrigin, QAngle.Zero, angle,
+        Vector.Zero, ev.Userid.Pawn.Value.Handle, ev.Userid.Team);
+    }
+
+    return HookResult.Continue;
+  }
+
+  public void Dispose() { }
+  public void Start() { }
+}
--- a/TTT/CS2/Items/ClusterGrenade/ClusterGrenadeMsgs.cs
+++ b/TTT/CS2/Items/ClusterGrenade/ClusterGrenadeMsgs.cs
@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.ClusterGrenade;
+
+public class ClusterGrenadeMsgs {
+  public static IMsg SHOP_ITEM_CLUSTER_GRENADE
+    => MsgFactory.Create(nameof(SHOP_ITEM_CLUSTER_GRENADE));
+
+  public static IMsg SHOP_ITEM_CLUSTER_GRENADE_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_CLUSTER_GRENADE_DESC));
+}
--- a/TTT/CS2/Items/Compass/AbstractCompassItem.cs
+++ b/TTT/CS2/Items/Compass/AbstractCompassItem.cs
@@ -0,0 +1,153 @@
+using System.Linq;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Timers;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Events;
+using TTT.API.Extensions;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Role;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+using TTT.CS2.Utils;
+using TTT.Game.Events.Game;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Compass;
+
+/// <summary>
+/// Base compass that renders a heading toward the nearest target returned by GetTargets.
+/// Child classes decide which targets to expose and who owns the item.
+/// </summary>
+public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
+  IListener, IPluginModule where TRole : class, IRole {
+  protected CompassConfig _Config { get; }
+  protected readonly IPlayerConverter<CCSPlayerController> Converter;
+  protected readonly ISet<IPlayer> Owners = new HashSet<IPlayer>();
+
+  protected AbstractCompassItem(IServiceProvider provider) : base(provider) {
+    _Config = provider.GetService<IStorage<CompassConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new CompassConfig();
+
+    Converter =
+      provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+  }
+
+  public override ShopItemConfig Config => _Config;
+
+  public void Start(BasePlugin? plugin) {
+    base.Start();
+    plugin?.AddTimer(0.1f, Tick, TimerFlags.REPEAT);
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRoundEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState == State.FINISHED) Owners.Clear();
+  }
+
+  /// <summary>
+  /// Return world positions to point at for this player.
+  /// </summary>
+  protected abstract IList<Vector> GetTargets(IOnlinePlayer requester);
+
+  /// <summary>
+  /// Whether this player currently owns/has this compass effect.
+  /// </summary>
+  protected abstract bool OwnsItem(IOnlinePlayer player);
+
+  public override void OnPurchase(IOnlinePlayer player) { Owners.Add(player); }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return OwnsItem(player) ?
+      PurchaseResult.ALREADY_OWNED :
+      base.CanPurchase(player);
+  }
+
+  private void Tick() {
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
+      return;
+
+    foreach (var player in Owners.OfType<IOnlinePlayer>()) {
+      var gamePlayer = Converter.GetPlayer(player);
+      if (gamePlayer == null) continue;
+      if (!player.IsAlive) continue;
+      ShowCompass(gamePlayer, player);
+    }
+  }
+
+  private void ShowCompass(CCSPlayerController viewer, IOnlinePlayer online) {
+    if (Games.ActiveGame?.Players == null) return;
+    if (viewer.PlayerPawn.Value == null) return;
+
+    var src = viewer.Pawn.Value?.AbsOrigin.Clone();
+    if (src == null) return;
+
+    var targets = GetTargets(online).ToList();
+    if (targets.Count == 0) return;
+
+    var (nearest, distance) = GetNearestVector(src, targets);
+    if (nearest == null || distance > _Config.MaxRange) return;
+
+    var normalizedYaw = AdjustGameAngle(viewer.PlayerPawn.Value.EyeAngles.Y);
+
+    var diff      = (nearest - src).Normalized();
+    var targetYaw = MathF.Atan2(diff.Y, diff.X) * 180f / MathF.PI;
+    targetYaw = AdjustGameAngle(targetYaw);
+
+    var compass = GenerateCompass(normalizedYaw, targetYaw);
+    compass = "<font color=\"#777777\">" + compass;
+    foreach (var c in "NESW".ToCharArray())
+      compass = compass.Replace(c.ToString(),
+        $"</font><font color=\"#FFFF00\">{c}</font><font color=\"#777777\">");
+    compass = compass.Replace("X",
+      "</font><font color=\"#FF0000\">X</font><font color=\"#777777\">");
+    compass += "</font>";
+
+    viewer.PrintToCenterHtml($"{compass} {GetDistanceDescription(distance)}");
+  }
+
+  private static float AdjustGameAngle(float angle) {
+    return 360 - (angle + 360) % 360 + 90;
+  }
+
+  private string GenerateCompass(float pointing, float target) {
+    return TextCompass.GenerateCompass(_Config.CompassFOV,
+      _Config.CompassLength, pointing, targetDir: target);
+  }
+
+  private static string GetDistanceDescription(float distance) {
+    return distance switch {
+      > 2000 => "AWP Distance",
+      > 1500 => "Scout Distance",
+      > 1000 => "Rifle Distance",
+      > 500  => "Pistol",
+      > 250  => "Nearby",
+      _      => "Knife Range"
+    };
+  }
+
+  private static (Vector?, float) GetNearestVector(in Vector src,
+    IList<Vector> targets) {
+    var     minDistSq = float.MaxValue;
+    Vector? nearest   = null;
+
+    foreach (var v in targets) {
+      var d2 = v.Clone().DistanceSquared(src);
+      if (d2 >= minDistSq) continue;
+      minDistSq = d2;
+      nearest   = v;
+    }
+
+    return (nearest, MathF.Sqrt(minDistSq));
+  }
+}
--- a/TTT/CS2/Items/Compass/BodyCompassItem.cs
+++ b/TTT/CS2/Items/Compass/BodyCompassItem.cs
@@ -0,0 +1,53 @@
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Extensions;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.CS2.API;
+using TTT.CS2.Extensions;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Compass;
+
+public static class BodyCompassItemExtensions {
+  public static void
+    AddBodyCompassServices(this IServiceCollection collection) {
+    collection.AddModBehavior<BodyCompassItem>();
+  }
+}
+
+public class BodyCompassItem(IServiceProvider provider)
+  : AbstractCompassItem<DetectiveRole>(provider) {
+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
+  public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS_BODY];
+
+  public override string Description
+    => Locale[CompassMsgs.SHOP_ITEM_COMPASS_BODY_DESC];
+
+  /// <summary>
+  /// For innocents: point to nearest traitor.
+  /// For traitors: point to nearest non-traitor (ally list in original code).
+  /// Returns target world positions as vectors.
+  /// </summary>
+  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
+      return Array.Empty<Vector>();
+
+    List<Vector> vectors = [];
+
+    foreach (var (apiBody, body) in bodies.Bodies) {
+      if (apiBody.IsIdentified) continue;
+      var origin = body.AbsOrigin.Clone();
+      if (origin == null) continue;
+      vectors.Add(origin);
+    }
+
+    return vectors;
+  }
+
+  override protected bool OwnsItem(IOnlinePlayer player) {
+    return Shop.HasItem<BodyCompassItem>(player);
+  }
+}
--- a/TTT/CS2/Items/Compass/CompassMsgs.cs
+++ b/TTT/CS2/Items/Compass/CompassMsgs.cs
@@ -0,0 +1,17 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.Compass;
+
+public class CompassMsgs {
+  public static IMsg SHOP_ITEM_COMPASS_PLAYER
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_PLAYER));
+
+  public static IMsg SHOP_ITEM_COMPASS_PLAYER_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_PLAYER_DESC));
+
+  public static IMsg SHOP_ITEM_COMPASS_BODY
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_BODY));
+
+  public static IMsg SHOP_ITEM_COMPASS_BODY_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_COMPASS_BODY_DESC));
+}
--- a/TTT/CS2/Items/Compass/InnoCompassItem.cs
+++ b/TTT/CS2/Items/Compass/InnoCompassItem.cs
@@ -0,0 +1,62 @@
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Extensions;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.CS2.Extensions;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Compass;
+
+public static class InnoCompassItemExtensions {
+  public static void
+    AddInnoCompassServices(this IServiceCollection collection) {
+    collection.AddModBehavior<InnoCompassItem>();
+  }
+}
+
+public class InnoCompassItem(IServiceProvider provider)
+  : AbstractCompassItem<TraitorRole>(provider) {
+  public override string Name => Locale[CompassMsgs.SHOP_ITEM_COMPASS_PLAYER];
+
+  public override string Description
+    => Locale[CompassMsgs.SHOP_ITEM_COMPASS_PLAYER_DESC];
+
+  /// <summary>
+  /// For innocents: point to nearest traitor.
+  /// For traitors: point to nearest non-traitor (ally list in original code).
+  /// Returns target world positions as vectors.
+  /// </summary>
+  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
+      return Array.Empty<Vector>();
+
+    var all = Games.ActiveGame.Players.OfType<IOnlinePlayer>()
+     .Where(p => p.IsAlive)
+     .ToList();
+
+    // Split by traitor role
+    var traitors = all.Where(p => Roles.GetRoles(p).Any(r => r is TraitorRole))
+     .ToList();
+    var allies = all.Where(p => !Roles.GetRoles(p).Any(r => r is TraitorRole))
+     .ToList();
+
+    var enemies = Roles.GetRoles(requester).Any(r => r is TraitorRole) ?
+      allies :
+      traitors;
+
+    // Convert to game controllers then to positions
+    var vectors = new List<Vector>(enemies.Count);
+    foreach (var enemy in enemies) {
+      var controller = Converter.GetPlayer(enemy);
+      var pos        = controller?.Pawn.Value?.AbsOrigin.Clone();
+      if (pos != null) vectors.Add(pos);
+    }
+
+    return vectors;
+  }
+
+  override protected bool OwnsItem(IOnlinePlayer player) {
+    return Shop.HasItem<InnoCompassItem>(player);
+  }
+}
--- a/TTT/CS2/Items/DNA/DnaListener.cs
+++ b/TTT/CS2/Items/DNA/DnaListener.cs
@@ -28,11 +28,11 @@ public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
  private readonly IBodyTracker bodies =
    provider.GetRequiredService<IBodyTracker>();

-  private readonly DnaScannerConfig config = provider
-   .GetService<IStorage<DnaScannerConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new DnaScannerConfig();
+  private DnaScannerConfig config
+    => Provider.GetService<IStorage<DnaScannerConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new DnaScannerConfig();

  private readonly Dictionary<string, DateTime> lastMessages = new();
  private readonly IShop shop = provider.GetRequiredService<IShop>();
--- a/TTT/CS2/Items/DNA/DnaMsgs.cs
+++ b/TTT/CS2/Items/DNA/DnaMsgs.cs
@@ -1,5 +1,6 @@
 using TTT.API.Player;
 using TTT.API.Role;
+using TTT.Game;
 using TTT.Game.lang;
 using TTT.Locale;

--- a/TTT/CS2/Items/DNA/DnaScanner.cs
+++ b/TTT/CS2/Items/DNA/DnaScanner.cs
@@ -18,11 +18,11 @@ public static class DnaScannerServiceCollection {

 public class DnaScanner(IServiceProvider provider)
  : RoleRestrictedItem<DetectiveRole>(provider) {
-  private readonly DnaScannerConfig config = provider
-   .GetService<IStorage<DnaScannerConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new DnaScannerConfig();
+  private DnaScannerConfig config
+    => Provider.GetService<IStorage<DnaScannerConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new DnaScannerConfig();

  public override string Name => Locale[DnaMsgs.SHOP_ITEM_DNA];
  public override string Description => Locale[DnaMsgs.SHOP_ITEM_DNA_DESC];
@@ -31,7 +31,7 @@ public class DnaScanner(IServiceProvider provider)
  public override void OnPurchase(IOnlinePlayer player) { }

  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
-    if (Shop.HasItem(player, this)) return PurchaseResult.ALREADY_OWNED;
+    if (Shop.HasItem<DnaScanner>(player)) return PurchaseResult.ALREADY_OWNED;
    return base.CanPurchase(player);
  }
 }
--- a/TTT/CS2/Items/OneHitKnife/OneHitKnife.cs
+++ b/TTT/CS2/Items/OneHitKnife/OneHitKnife.cs
@@ -18,11 +18,11 @@ public static class OneHitKnifeServiceCollection {

 public class OneHitKnife(IServiceProvider provider)
  : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly OneHitKnifeConfig config = provider
-   .GetService<IStorage<OneHitKnifeConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new OneHitKnifeConfig();
+  private OneHitKnifeConfig config
+    => Provider.GetService<IStorage<OneHitKnifeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new OneHitKnifeConfig();

  public override string Name
    => Locale[OneHitKnifeMsgs.SHOP_ITEM_ONE_HIT_KNIFE];
--- a/TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs
+++ b/TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs
@@ -13,14 +13,14 @@ namespace TTT.CS2.Items.OneHitKnife;

 public class OneHitKnifeListener(IServiceProvider provider)
  : BaseListener(provider) {
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
-
-  private readonly OneHitKnifeConfig config =
-    provider.GetService<IStorage<OneHitKnifeConfig>>()
+  private OneHitKnifeConfig config
+    => Provider.GetService<IStorage<OneHitKnifeConfig>>()
    ?.Load()
     .GetAwaiter()
     .GetResult() ?? new OneHitKnifeConfig();

+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
  [UsedImplicitly]
  [EventHandler]
  public void OnDamage(PlayerDamagedEvent ev) {
@@ -32,13 +32,12 @@ public class OneHitKnifeListener(IServiceProvider provider)

    if (attacker == null) return;
    if (!shop.HasItem<OneHitKnife>(attacker)) return;
-    if (victim is not IOnlinePlayer onlineVictim) return;

    var friendly = Roles.GetRoles(attacker)
     .Any(r => Roles.GetRoles(victim).Contains(r));
    if (friendly && !config.FriendlyFire) return;

    shop.RemoveItem<OneHitKnife>(attacker);
-    ev.HpLeft = 0;
+    ev.HpLeft = -100;
  }
 }
--- a/TTT/CS2/Items/PoisonShots/PoisonShotsItem.cs
+++ b/TTT/CS2/Items/PoisonShots/PoisonShotsItem.cs
@@ -18,11 +18,11 @@ public static class PoisonShotServiceCollection {

 public class PoisonShotsItem(IServiceProvider provider)
  : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly PoisonShotsConfig config = provider
-   .GetService<IStorage<PoisonShotsConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new PoisonShotsConfig();
+  private PoisonShotsConfig config
+    => Provider.GetService<IStorage<PoisonShotsConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonShotsConfig();

  public override string Name => Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS];

--- a/TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs
+++ b/TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs
@@ -13,6 +13,7 @@ using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
+using TTT.Game.Events.Body;
 using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
@@ -21,8 +22,10 @@ namespace TTT.CS2.Items.PoisonShots;

 public class PoisonShotsListener(IServiceProvider provider)
  : BaseListener(provider), IPluginModule {
-  private readonly PoisonShotsConfig config =
-    provider.GetService<IStorage<PoisonShotsConfig>>()
+  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+
+  private PoisonShotsConfig config
+    => Provider.GetService<IStorage<PoisonShotsConfig>>()
    ?.Load()
     .GetAwaiter()
     .GetResult() ?? new PoisonShotsConfig();
@@ -32,8 +35,6 @@ public class PoisonShotsListener(IServiceProvider provider)

  private readonly Dictionary<IPlayer, int> poisonShots = new();

-  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
-
  private readonly List<IDisposable> poisonTimers = [];

  private readonly IScheduler scheduler =
@@ -41,6 +42,8 @@ public class PoisonShotsListener(IServiceProvider provider)

  private readonly IShop shop = provider.GetRequiredService<IShop>();

+  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
+
  public override void Dispose() {
    base.Dispose();
    foreach (var timer in poisonTimers) timer.Dispose();
@@ -66,7 +69,6 @@ public class PoisonShotsListener(IServiceProvider provider)
    if (ev.Attacker == null) return;
    if (!poisonShots.TryGetValue(ev.Attacker, out var shot) || shot <= 0)
      return;
-    Messenger.DebugAnnounce("weapon: " + ev.Weapon);
    if (ev.Weapon == null || !Tag.GUNS.Contains(ev.Weapon)) return;
    Messenger.Message(ev.Attacker,
      Locale[PoisonShotMsgs.SHOP_ITEM_POISON_HIT(ev.Player)]);
@@ -81,6 +83,7 @@ public class PoisonShotsListener(IServiceProvider provider)
    foreach (var timer in poisonTimers) timer.Dispose();
    poisonTimers.Clear();
    poisonShots.Clear();
+    killedWithPoison.Clear();
  }

  [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
@@ -105,7 +108,7 @@ public class PoisonShotsListener(IServiceProvider provider)
    if (!online.IsAlive) return false;

    var dmgEvent = new PlayerDamagedEvent(online,
-      effect.Shooter as IOnlinePlayer,
+      effect.Shooter as IOnlinePlayer, online.Health,
      online.Health - config.PoisonConfig.DamagePerTick) {
      Weapon = $"[{Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS]}]"
    };
@@ -115,19 +118,20 @@ public class PoisonShotsListener(IServiceProvider provider)
    if (dmgEvent.IsCanceled) return true;

    if (online.Health - config.PoisonConfig.DamagePerTick <= 0) {
+      killedWithPoison[online.Id] = effect.Shooter;
      var deathEvent = new PlayerDeathEvent(online)
       .WithKiller(effect.Shooter as IOnlinePlayer)
       .WithWeapon($"[{Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS]}]");
      bus.Dispatch(deathEvent);
    }

-    online.Health -= config.PoisonConfig.DamagePerTick;
    effect.Ticks++;
    effect.DamageGiven += config.PoisonConfig.DamagePerTick;

    var gamePlayer = converter.GetPlayer(online);
    gamePlayer?.ColorScreen(config.PoisonColor, 0.2f, 0.3f);
-    gamePlayer?.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
+    if (gamePlayer != null)
+      gamePlayer.DealPoisonDamage(config.PoisonConfig.DamagePerTick);

    return effect.DamageGiven < config.PoisonConfig.TotalDamage;
  }
@@ -158,4 +162,15 @@ public class PoisonShotsListener(IServiceProvider provider)
    public int Ticks { get; set; }
    public int DamageGiven { get; set; }
  }
+
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithPoison.TryGetValue(ev.Body.OfPlayer.Id, out var shooter))
+      return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = shooter as IOnlinePlayer;
+  }
 }
--- a/TTT/CS2/Items/PoisonSmoke/PoisonSmokeItem.cs
+++ b/TTT/CS2/Items/PoisonSmoke/PoisonSmokeItem.cs
@@ -18,8 +18,8 @@ public static class PoisonSmokeServiceCollection {

 public class PoisonSmokeItem(IServiceProvider provider)
  : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly PoisonSmokeConfig config =
-    provider.GetService<IStorage<PoisonSmokeConfig>>()
+  private PoisonSmokeConfig config
+    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
    ?.Load()
     .GetAwaiter()
     .GetResult() ?? new PoisonSmokeConfig();
--- a/TTT/CS2/Items/PoisonSmoke/PoisonSmokeListener.cs
+++ b/TTT/CS2/Items/PoisonSmoke/PoisonSmokeListener.cs
@@ -9,17 +9,24 @@ using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using ShopAPI.Configs.Traitor;
 using TTT.API;
+using TTT.API.Events;
+using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
+using TTT.Game.Events.Body;
+using TTT.Game.Events.Game;
+using TTT.Game.Events.Player;
+using TTT.Game.Listeners;
 using TTT.Game.Roles;

 namespace TTT.CS2.Items.PoisonSmoke;

-public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
-  private readonly PoisonSmokeConfig config =
-    provider.GetService<IStorage<PoisonSmokeConfig>>()
+public class PoisonSmokeListener(IServiceProvider provider)
+  : BaseListener(provider), IPluginModule {
+  private PoisonSmokeConfig config
+    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
    ?.Load()
     .GetAwaiter()
     .GetResult() ?? new PoisonSmokeConfig();
@@ -27,26 +34,20 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

-  private readonly IPlayerFinder finder =
-    provider.GetRequiredService<IPlayerFinder>();
-
  private readonly List<IDisposable> poisonSmokes = [];

-  private readonly IRoleAssigner roleAssigner =
-    provider.GetRequiredService<IRoleAssigner>();
-
-  private readonly IScheduler scheduler =
-    provider.GetRequiredService<IScheduler>();
-
  private readonly IShop shop = provider.GetRequiredService<IShop>();

-  public void Dispose() {
+  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+
+  public override void Dispose() {
+    base.Dispose();
    foreach (var timer in poisonSmokes) timer.Dispose();

    poisonSmokes.Clear();
+    killedWithPoison.Clear();
  }

-  public void Start() { }

  [UsedImplicitly]
  [GameEventHandler]
@@ -62,17 +63,18 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
    var projectile =
      Utilities.GetEntityFromIndex<CSmokeGrenadeProjectile>(ev.Entityid);
    if (projectile == null || !projectile.IsValid) return HookResult.Continue;
-    startPoisonEffect(projectile);
+    startPoisonEffect(projectile, player);
    return HookResult.Continue;
  }

  [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
-  private void startPoisonEffect(CSmokeGrenadeProjectile projectile) {
+  private void startPoisonEffect(CSmokeGrenadeProjectile projectile,
+    IOnlinePlayer thrower) {
    IDisposable? timer = null;

-    var effect = new PoisonEffect(projectile);
+    var effect = new PoisonEffect(projectile, thrower);

-    timer = scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
+    timer = Scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
      => {
      Server.NextWorldUpdate(() => {
        if (tickPoisonEffect(effect) || timer == null) return;
@@ -88,31 +90,67 @@ public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
    if (!effect.Projectile.IsValid) return false;
    effect.Ticks++;

-    var players = finder.GetOnline()
-     .Where(player => player.IsAlive && roleAssigner.GetRoles(player)
+    var players = Finder.GetOnline()
+     .Where(player => player.IsAlive && Roles.GetRoles(player)
       .Any(role => role is InnocentRole or DetectiveRole));

-    var gamePlayers = players.Select(p => converter.GetPlayer(p))
-     .Where(p => p != null && p.Pawn.Value != null && p.Pawn.Value.IsValid)
-     .Select(p => (p!, p?.Pawn.Value?.AbsOrigin.Clone()!));
+    var gamePlayers = players.Select(p => (p, converter.GetPlayer(p)))
+     .Where(p => p.Item2 != null && p.Item2.Pawn.Value != null
+        && p.Item2.Pawn.Value.IsValid)
+     .Select(p => (p!, p.Item2?.Pawn.Value?.AbsOrigin.Clone()!));

    gamePlayers = gamePlayers.Where(t
      => t.Item2.Distance(effect.Origin) <= config.SmokeRadius);

-    foreach (var player in gamePlayers.Select(p => p.Item1)) {
+    foreach (var (apiPlayer, gamePlayer) in gamePlayers.Select(p => p.Item1)) {
      if (effect.DamageGiven >= config.PoisonConfig.TotalDamage) continue;
-      player.AddHealth(-config.PoisonConfig.DamagePerTick);
-      player.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
+      if (gamePlayer.GetHealth() - config.PoisonConfig.DamagePerTick <= 0) {
+        killedWithPoison.Add(apiPlayer.Id);
+        var playerDeathEvent = new PlayerDeathEvent(apiPlayer)
+         .WithKiller(effect.Attacker as IOnlinePlayer)
+         .WithWeapon("[Poison Smoke]");
+        Bus.Dispatch(playerDeathEvent);
+
+        gamePlayer.SetHealth(0);
+        continue;
+      }
+
+      var dmgEvent = new PlayerDamagedEvent(apiPlayer,
+        effect.Attacker as IOnlinePlayer, config.PoisonConfig.DamagePerTick) {
+        Weapon = "[Poison Smoke]"
+      };
+
+      Bus.Dispatch(dmgEvent);
+
+      gamePlayer.DealPoisonDamage(config.PoisonConfig.DamagePerTick);
      effect.DamageGiven += config.PoisonConfig.DamagePerTick;
    }

    return effect.DamageGiven < config.PoisonConfig.TotalDamage;
  }

-  private class PoisonEffect(CSmokeGrenadeProjectile projectile) {
+  private class PoisonEffect(CSmokeGrenadeProjectile projectile,
+    IOnlinePlayer attacker) {
    public int Ticks { get; set; }
    public int DamageGiven { get; set; }
    public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
    public CSmokeGrenadeProjectile Projectile { get; } = projectile;
+    public IPlayer Attacker { get; } = attacker;
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    killedWithPoison.Clear();
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithPoison.Contains(ev.Body.OfPlayer.Id)) return;
+    if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
+      ev.IsCanceled = true;
  }
 }
--- a/TTT/CS2/Items/SilentAWP/SilentAWPItem.cs
+++ b/TTT/CS2/Items/SilentAWP/SilentAWPItem.cs
@@ -0,0 +1,104 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.UserMessages;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
+using TTT.Game.Roles;
+using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
+
+namespace TTT.CS2.Items.SilentAWP;
+
+public static class SilentAWPServiceCollection {
+  public static void AddSilentAWPServices(this IServiceCollection services) {
+    services.AddModBehavior<SilentAWPItem>();
+  }
+}
+
+public class SilentAWPItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
+  private SilentAWPConfig config
+    => Provider.GetService<IStorage<SilentAWPConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new SilentAWPConfig();
+
+  private readonly IPlayerConverter<CCSPlayerController> playerConverter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IDictionary<string, int> silentShots =
+    new Dictionary<string, int>();
+
+  public override string Name => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP];
+
+  public override string Description
+    => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public void Start(BasePlugin? plugin) {
+    base.Start();
+    plugin?.HookUserMessage(452, onWeaponSound);
+  }
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    silentShots[player.Id] = config.CurrentAmmo ?? 0 + config.ReserveAmmo ?? 0;
+    Task.Run(async () => {
+      await Inventory.RemoveWeaponInSlot(player, 0);
+      await Inventory.GiveWeapon(player, config);
+    });
+  }
+
+  private HookResult onWeaponSound(UserMessage msg) {
+    var defIndex = msg.ReadUInt("item_def_index");
+
+    if (config.WeaponIndex != defIndex) return HookResult.Continue;
+    var splits = msg.DebugString.Split("\n");
+    if (splits.Length < 5) return HookResult.Continue;
+    var angleLines = msg.DebugString.Split("\n")[1..4]
+     .Select(s => s.Trim())
+     .ToList();
+    if (!angleLines[0].Contains('x') || !angleLines[1].Contains('y')
+      || !angleLines[2].Contains('z'))
+      return HookResult.Continue;
+    var x      = float.Parse(angleLines[0].Split(' ')[1]);
+    var y      = float.Parse(angleLines[1].Split(' ')[1]);
+    var z      = float.Parse(angleLines[2].Split(' ')[1]);
+    var vec    = new Vector(x, y, z);
+    var player = findPlayerByCoord(vec);
+
+    if (player == null) return HookResult.Continue;
+    if (playerConverter.GetPlayer(player) is not IOnlinePlayer apiPlayer)
+      return HookResult.Continue;
+
+    if (!silentShots.TryGetValue(apiPlayer.Id, out var shots) || shots <= 0)
+      return HookResult.Continue;
+
+    silentShots[apiPlayer.Id] = shots - 1;
+    if (silentShots[apiPlayer.Id] == 0) {
+      silentShots.Remove(apiPlayer.Id);
+      Shop.RemoveItem<SilentAWPItem>(apiPlayer);
+    }
+
+    msg.Recipients.Clear();
+    return HookResult.Handled;
+  }
+
+  private CCSPlayerController? findPlayerByCoord(Vector vec) {
+    foreach (var pl in Utilities.GetPlayers()) {
+      var origin = pl.GetEyePosition();
+      if (origin == null) continue;
+      var dist = vec.DistanceSquared(origin);
+      if (dist < 1) return pl;
+    }
+
+    return null;
+  }
+}
--- a/TTT/CS2/Items/SilentAWP/SilentAWPMsgs.cs
+++ b/TTT/CS2/Items/SilentAWP/SilentAWPMsgs.cs
@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.SilentAWP;
+
+public class SilentAWPMsgs {
+  public static IMsg SHOP_ITEM_SILENT_AWP
+    => MsgFactory.Create(nameof(SHOP_ITEM_SILENT_AWP));
+
+  public static IMsg SHOP_ITEM_SILENT_AWP_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_SILENT_AWP_DESC));
+}
--- a/TTT/CS2/Items/Station/DamageStation.cs
+++ b/TTT/CS2/Items/Station/DamageStation.cs
@@ -1,13 +1,18 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI.Configs.Traitor;
 using TTT.API.Events;
 using TTT.API.Extensions;
+using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
+using TTT.CS2.Utils;
+using TTT.Game.Events.Body;
+using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Roles;

@@ -24,7 +29,9 @@ public class DamageStation(IServiceProvider provider)
    provider.GetService<IStorage<DamageStationConfig>>()
    ?.Load()
     .GetAwaiter()
-     .GetResult() ?? new DamageStationConfig()) {
+     .GetResult() ?? new DamageStationConfig()), IListener {
+  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
+
  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

@@ -34,13 +41,14 @@ public class DamageStation(IServiceProvider provider)
  private readonly IRoleAssigner roles =
    provider.GetRequiredService<IRoleAssigner>();

-  private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
-
  public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HURT];

  public override string Description
    => Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];

+  private Dictionary<string, StationInfo> killedWithStation =
+    new Dictionary<string, StationInfo>();
+
  override protected void onInterval() {
    var players  = finder.GetOnline();
    var toRemove = new List<CPhysicsPropMultiplayer>();
@@ -51,8 +59,12 @@ public class DamageStation(IServiceProvider provider)
        continue;
      }

+      if (!prop.IsValid || prop.AbsOrigin == null) {
+        toRemove.Add(prop);
+        continue;
+      }
+
      var propPos = prop.AbsOrigin;
-      if (propPos == null) continue;

      var playerMapping = players.Select(p
          => (ApiPlayer: p, GamePlayer: converter.GetPlayer(p)))
@@ -74,28 +86,46 @@ public class DamageStation(IServiceProvider provider)
          (int)Math.Floor(_Config.HealthIncrements * healthScale);

        var dmgEvent = new PlayerDamagedEvent(player,
-          info.Owner as IOnlinePlayer, player.Health + damageAmount) {
-          Weapon = $"[{Name}]"
-        };
+          info.Owner as IOnlinePlayer, damageAmount) { Weapon = $"[{Name}]" };

        bus.Dispatch(dmgEvent);

        damageAmount = -dmgEvent.DmgDealt;

-        player.Health    += damageAmount;
-        info.HealthGiven += damageAmount;
-
        if (player.Health + damageAmount <= 0) {
+          killedWithStation[player.Id] = info;
          var playerDeath = new PlayerDeathEvent(player)
           .WithKiller(info.Owner as IOnlinePlayer)
           .WithWeapon($"[{Name}]");
          bus.Dispatch(playerDeath);
        }

-        gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
+        player.Health    += damageAmount;
+        info.HealthGiven += damageAmount;
+
+        gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
      }
    }

    foreach (var prop in toRemove) props.Remove(prop);
  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    killedWithStation.Clear();
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithStation.TryGetValue(ev.Body.OfPlayer.Id,
+      out var stationInfo))
+      return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = stationInfo.Owner as IOnlinePlayer;
+  }
 }
--- a/TTT/CS2/Items/Station/HealthStation.cs
+++ b/TTT/CS2/Items/Station/HealthStation.cs
@@ -36,8 +36,12 @@ public class HealthStation(IServiceProvider provider)
        continue;
      }

+      if (!prop.IsValid || prop.AbsOrigin == null) {
+        toRemove.Add(prop);
+        continue;
+      }
+
      var propPos = prop.AbsOrigin;
-      if (propPos == null) continue;

      var playerDists = players
       .Select(p => (Player: p, Pos: p.Pawn.Value?.AbsOrigin))
@@ -49,13 +53,14 @@ public class HealthStation(IServiceProvider provider)
      foreach (var (player, dist) in playerDists) {
        var maxHp       = player.Pawn.Value?.MaxHealth ?? 100;
        var healthScale = 1.0 - dist / _Config.MaxRange;
-        var healAmount =
+        var maxHealAmo =
          (int)Math.Ceiling(_Config.HealthIncrements * healthScale);
-        var newHealth = Math.Min(player.GetHealth() + healAmount, maxHp);
+        var newHealth   = Math.Min(player.GetHealth() + maxHealAmo, maxHp);
+        var healthGiven = newHealth - player.GetHealth();
        player.SetHealth(newHealth);
-        info.HealthGiven += healAmount;
+        info.HealthGiven += healthGiven;

-        player.ExecuteClientCommand("play " + _Config.UseSound);
+        if (healthGiven > 0) player.EmitSound("HealthShot.Pickup", null, 0.1f);
      }
    }

--- a/TTT/CS2/Items/Station/StationItem.cs
+++ b/TTT/CS2/Items/Station/StationItem.cs
@@ -11,18 +11,20 @@ using TTT.API;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;

 namespace TTT.CS2.Items.Station;

 public abstract class StationItem<T>(IServiceProvider provider,
  StationConfig config)
  : RoleRestrictedItem<T>(provider), IPluginModule where T : IRole {
-  private readonly long PROP_SIZE_SQUARED = 500;
  protected readonly StationConfig _Config = config;

  protected readonly IPlayerConverter<CCSPlayerController> Converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

+  private readonly long PROP_SIZE_SQUARED = 500;
+
  protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
    new();

@@ -126,12 +128,15 @@ public abstract class StationItem<T>(IServiceProvider provider,
      if (gamePlayer == null || !gamePlayer.Pawn.IsValid
        || gamePlayer.Pawn.Value == null)
        return;
-      var spawnPos = gamePlayer.Pawn.Value.AbsOrigin.Clone();
-      if (spawnPos != null && gamePlayer.PlayerPawn.Value != null) {
-        var forward = gamePlayer.PlayerPawn.Value.EyeAngles.ToForward();
-        forward.Z =  0;
-        spawnPos  += forward.Normalized() * 8;
-      }
+
+      var spawnPos = gamePlayer.GetEyePosition();
+      var forward  = gamePlayer.Pawn.Value.AbsRotation;
+
+      if (spawnPos == null) return;
+
+      if (forward == null) forward = new QAngle(0, 0, 0);
+
+      spawnPos += forward.ToForward() * 50;

      prop.Teleport(spawnPos);
    });
--- a/TTT/CS2/Listeners/AfkTimerListener.cs
+++ b/TTT/CS2/Listeners/AfkTimerListener.cs
@@ -0,0 +1,84 @@
+using System.Drawing;
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+using TTT.CS2.lang;
+using TTT.CS2.Utils;
+using TTT.Game;
+using TTT.Game.Events.Game;
+using TTT.Game.Listeners;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Listeners;
+
+public class AfkTimerListener(IServiceProvider provider)
+  : BaseListener(provider) {
+  private TTTConfig config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private IDisposable? specTimer, specWarnTimer;
+
+  public override void Dispose() {
+    base.Dispose();
+
+    specTimer?.Dispose();
+    specWarnTimer?.Dispose();
+  }
+
+  [UsedImplicitly]
+  [EventHandler(IgnoreCanceled = true)]
+  public void OnRoundStart(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.IN_PROGRESS) {
+      specTimer?.Dispose();
+      specWarnTimer?.Dispose();
+      return;
+    }
+
+    specWarnTimer?.Dispose();
+    specWarnTimer = Scheduler.Schedule(config.RoundCfg.CheckAFKTimespan / 2, ()
+      => {
+      Server.NextWorldUpdate(() => {
+        foreach (var player in getAfkPlayers()) {
+          var apiPlayer = converter.GetPlayer(player);
+          var timetill  = config.RoundCfg.CheckAFKTimespan / 2;
+          Messenger.Message(apiPlayer, Locale[CS2Msgs.AFK_WARNING(timetill)]);
+        }
+      });
+    });
+
+    specTimer?.Dispose();
+    specTimer = Scheduler.Schedule(config.RoundCfg.CheckAFKTimespan, () => {
+      Server.NextWorldUpdate(() => {
+        foreach (var player in getAfkPlayers()) {
+          var apiPlayer = converter.GetPlayer(player);
+#if !DEBUG
+          player.ChangeTeam(CsTeam.Spectator);
+#endif
+          Messenger.Message(apiPlayer, Locale[CS2Msgs.AFK_MOVED]);
+        }
+      });
+    });
+  }
+
+  private List<CCSPlayerController> getAfkPlayers() {
+    return Utilities.GetPlayers()
+     .Where(p => p.PlayerPawn.Value != null
+        && p is { Team: CsTeam.CounterTerrorist or CsTeam.Terrorist }
+        && p.GetHealth() >= 0 && !p.PlayerPawn.Value.HasMovedSinceSpawn)
+     .ToList();
+  }
+}
--- a/TTT/CS2/Listeners/BodyPickupListener.cs
+++ b/TTT/CS2/Listeners/BodyPickupListener.cs
@@ -8,6 +8,7 @@ using TTT.API.Player;
 using TTT.CS2.API;
 using TTT.CS2.Events;
 using TTT.CS2.Extensions;
+using TTT.Game;
 using TTT.Game.Events.Body;
 using TTT.Game.lang;
 using TTT.Game.Listeners;
@@ -57,7 +58,8 @@ public class BodyPickupListener(IServiceProvider provider)
    if (ragdoll.IsValid) ragdoll.SetColor(primary.Color);

    var online = converter.GetPlayer(ev.Body.OfPlayer);
-    if (online is not { IsValid: true }) return;
+    if (online is not { IsValid: true } || online.Team == CsTeam.Spectator)
+      return;

    if (primary is InnocentRole) online.SwitchTeam(CsTeam.CounterTerrorist);

--- a/TTT/CS2/Listeners/KarmaBanner.cs
+++ b/TTT/CS2/Listeners/KarmaBanner.cs
@@ -15,21 +15,22 @@ using TTT.Karma.lang;
 namespace TTT.CS2.Listeners;

 public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
-  private readonly KarmaConfig config =
-    provider.GetService<IStorage<KarmaConfig>>()
+  private KarmaConfig config
+    => Provider.GetService<IStorage<KarmaConfig>>()
    ?.Load()
     .GetAwaiter()
     .GetResult() ?? new KarmaConfig();

-  private readonly IKarmaService karma =
-    provider.GetRequiredService<IKarmaService>();
-
  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

-  private readonly Dictionary<IPlayer, DateTime> lastWarned = new();
  private readonly Dictionary<IPlayer, int> cooldownRounds = new();

+  private readonly IKarmaService karma =
+    provider.GetRequiredService<IKarmaService>();
+
+  private readonly Dictionary<IPlayer, DateTime> lastWarned = new();
+
  [UsedImplicitly]
  [EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
  public void OnKarmaUpdate(KarmaUpdateEvent ev) {
--- a/TTT/CS2/Listeners/PlayerStatsTracker.cs
+++ b/TTT/CS2/Listeners/PlayerStatsTracker.cs
@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Game;
@@ -24,6 +25,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {

  public void Dispose() { }

+  [UsedImplicitly]
  [EventHandler(Priority = Priority.MONITOR)]
  public void OnIdentify(BodyIdentifyEvent ev) {
    var gamePlayer = converter.GetPlayer(ev.Body.OfPlayer);
@@ -40,6 +42,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {

  // Needs to be higher so we detect the kill before the game ends
  // in the case that this is the last player
+  [UsedImplicitly]
  [EventHandler(Priority = Priority.HIGH)]
  public void OnKill(PlayerDeathEvent ev) {
    var killer = ev.Killer == null ? null : converter.GetPlayer(ev.Killer);
@@ -59,6 +62,7 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
    }
  }

+  [UsedImplicitly]
  [EventHandler]
  public void OnRoundEnd(GameStateUpdateEvent ev) {
    if (ev.NewState == State.IN_PROGRESS) {
--- a/TTT/CS2/Listeners/RoundTimerListener.cs
+++ b/TTT/CS2/Listeners/RoundTimerListener.cs
@@ -22,19 +22,16 @@ namespace TTT.CS2.Listeners;

 public class RoundTimerListener(IServiceProvider provider)
  : BaseListener(provider) {
-  private readonly TTTConfig config = provider
-   .GetRequiredService<IStorage<TTTConfig>>()
-   .Load()
-   .GetAwaiter()
-   .GetResult() ?? new TTTConfig();
+  private TTTConfig config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();

  private readonly IPlayerConverter<CCSPlayerController> converter =
    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();

-  private readonly IScheduler scheduler = provider
-   .GetRequiredService<IScheduler>();
-
-  private IDisposable? endTimer;
+  public IDisposable? EndTimer;

  [UsedImplicitly]
  [EventHandler(IgnoreCanceled = true)]
@@ -45,7 +42,9 @@ public class RoundTimerListener(IServiceProvider provider)
         .TotalSeconds);
        Server.ExecuteCommand("mp_ignore_round_win_conditions 1");
        foreach (var player in Utilities.GetPlayers()
-         .Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE))
+         .Where(p => p.GetHealth() <= 0 && p is {
+            Team: CsTeam.CounterTerrorist or CsTeam.Terrorist
+          }))
          player.Respawn();

        foreach (var player in Utilities.GetPlayers())
@@ -55,14 +54,23 @@ public class RoundTimerListener(IServiceProvider provider)
      return;
    }

-    if (ev.NewState == State.FINISHED) endTimer?.Dispose();
+    if (ev.NewState == State.IN_PROGRESS)
+      Server.NextWorldUpdate(() => {
+        foreach (var player in Utilities.GetPlayers()
+         .Where(p => p.GetHealth() <= 0 && p is {
+            Team: CsTeam.CounterTerrorist or CsTeam.Terrorist
+          }))
+          player.Respawn();
+      });
+
+    if (ev.NewState == State.FINISHED) EndTimer?.Dispose();
    if (ev.NewState != State.IN_PROGRESS) return;
    var duration = config.RoundCfg.RoundDuration(ev.Game.Players.Count);
    Server.NextWorldUpdate(()
      => RoundUtil.SetTimeRemaining((int)duration.TotalSeconds));

-    endTimer?.Dispose();
-    endTimer = scheduler.Schedule(duration,
+    EndTimer?.Dispose();
+    EndTimer = Scheduler.Schedule(duration,
      () => {
        Server.NextWorldUpdate(()
          => ev.Game.EndGame(EndReason.TIMEOUT(new InnocentRole(Provider))));
@@ -119,6 +127,7 @@ public class RoundTimerListener(IServiceProvider provider)
      var role = Roles.GetRoles(player).FirstOrDefault();
      if (role == null) continue;
      csPlayer.SetClan(role.Name, false);
+      if (csPlayer.Team == CsTeam.Spectator) continue;
      if (role is InnocentRole) csPlayer.SwitchTeam(CsTeam.CounterTerrorist);
    }

@@ -128,6 +137,6 @@ public class RoundTimerListener(IServiceProvider provider)
  public override void Dispose() {
    base.Dispose();

-    endTimer?.Dispose();
+    EndTimer?.Dispose();
  }
 }
--- a/TTT/CS2/Player/CS2AliveSpoofer.cs
+++ b/TTT/CS2/Player/CS2AliveSpoofer.cs
@@ -1,5 +1,7 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using JetBrains.Annotations;
 using TTT.API;
 using TTT.CS2.API;

@@ -8,6 +10,7 @@ namespace TTT.CS2.Player;
 public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
  private readonly HashSet<CCSPlayerController> _fakeAlivePlayers = new();
  public ISet<CCSPlayerController> FakeAlivePlayers => _fakeAlivePlayers;
+  private BasePlugin? plugin = null;

  public void SpoofAlive(CCSPlayerController player) {
    if (player.IsBot) {
@@ -44,16 +47,35 @@ public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
    FakeAlivePlayers.Remove(player);
  }

-  public void Dispose() { }
-  public void Start() { }
-
-  public void Start(BasePlugin? plugin) {
-    plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnTick>(
+  public void Dispose() {
+    _fakeAlivePlayers.Clear();
+    plugin?.RemoveListener<CounterStrikeSharp.API.Core.Listeners.OnTick>(
      onTick);
  }

+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    if (plugin == null) return;
+    this.plugin = plugin;
+    plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnTick>(
+      onTick);
+    plugin?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.OnMapStart>(
+      onMapStart);
+  }
+
+  private void onMapStart(string mapName) { _fakeAlivePlayers.Clear(); }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnDisconnect(EventPlayerDisconnect ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    _fakeAlivePlayers.Remove(ev.Userid);
+    return HookResult.Continue;
+  }
+
  private void onTick() {
-    _fakeAlivePlayers.RemoveWhere(p => !p.IsValid);
+    _fakeAlivePlayers.RemoveWhere(p => !p.IsValid || p.Handle == IntPtr.Zero);
    foreach (var player in _fakeAlivePlayers) {
      player.PawnIsAlive = true;
      Utilities.SetStateChanged(player, "CCSPlayerController",
--- a/TTT/CS2/Player/CS2PermManager.cs
+++ b/TTT/CS2/Player/CS2PermManager.cs
@@ -1,7 +1,5 @@
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Admin;
-using CounterStrikeSharp.API.Modules.Entities;
 using TTT.API.Player;

 namespace TTT.CS2.Player;
@@ -10,12 +8,9 @@ public class CS2PermManager(IPlayerConverter<CCSPlayerController> converter)
  : IPermissionManager {
  public bool HasFlags(IPlayer player, params string[] flags) {
    if (flags.Length == 0) return true;
-    Console.WriteLine("Checking flags for player: " + player.Id);
    var gamePlayer = converter.GetPlayer(player);
    if (gamePlayer == null) return false;
-
-    ulong.TryParse(player.Id, out var steamId);
-    return AdminManager.PlayerHasPermissions(new SteamID(steamId), flags);
+    return AdminManager.PlayerHasPermissions(gamePlayer, flags);
  }

  public bool InGroups(IPlayer player, params string[] groups) {
--- a/TTT/CS2/Player/CS2Player.cs
+++ b/TTT/CS2/Player/CS2Player.cs
@@ -1,7 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using TTT.API.Player;
-using TTT.Game.Events.Player;

 namespace TTT.CS2.Player;

@@ -48,10 +47,6 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
    }
  }

-  private int namePadding
-    => Math.Min(Utilities.GetPlayers().Select(p => p.PlayerName.Length).Max(),
-      24);
-
  public bool Equals(CS2Player? other) {
    if (other is null) return false;
    return Id == other.Id;
@@ -120,6 +115,11 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
  // Goal: Pad the name to a fixed width for better alignment in logs
  // Left-align ID, right-align name
  private string createPaddedName() {
+    var onlineLengths = Utilities.GetPlayers()
+     .Select(p => p.PlayerName.Length)
+     .ToList();
+    if (onlineLengths.Count == 0) return CreatePaddedName(Id, Name, 13);
+    var namePadding = Math.Min(onlineLengths.Max(), 24);
    return CreatePaddedName(Id, Name, namePadding + 8);
  }

--- a/TTT/CS2/Roles/CS2TraitorRole.cs
+++ b/TTT/CS2/Roles/CS2TraitorRole.cs
@@ -0,0 +1,21 @@
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Player;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Roles;
+
+public class CS2TraitorRole(IServiceProvider provider) : TraitorRole(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public override void OnAssign(IOnlinePlayer player) {
+    base.OnAssign(player);
+
+    var gamePlayer = converter.GetPlayer(player);
+    if (gamePlayer == null) return;
+
+    gamePlayer.AcceptInput("SetTargetName", null, null, "traitor");
+    if (gamePlayer.Pawn.Value != null) gamePlayer.Pawn.Value.Target = "traitor";
+  }
+}
--- a/TTT/CS2/ThirdParties/Binaries/MAULActainShared.dll
+++ b/TTT/CS2/ThirdParties/Binaries/MAULActainShared.dll
--- a/TTT/CS2/ThirdParties/eGO/EgoApi.cs
+++ b/TTT/CS2/ThirdParties/eGO/EgoApi.cs
@@ -0,0 +1,9 @@
+using CounterStrikeSharp.API.Core.Capabilities;
+using MAULActainShared.plugin;
+
+namespace TTT.CS2.ThirdParties.eGO;
+
+public class EgoApi {
+  public static PluginCapability<IActain> MAUL { get; } =
+    new("maulactain:core");
+}
--- a/TTT/CS2/Utils/DamageDealingHelper.cs
+++ b/TTT/CS2/Utils/DamageDealingHelper.cs
@@ -0,0 +1,87 @@
+using System.Net;
+using System.Numerics;
+using System.Runtime.InteropServices;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
+
+namespace TTT.CS2.Utils;
+
+public class DamageDealingHelper {
+  public static void DealDamage(CCSPlayerController target,
+    CCSPlayerController? attacker, int damage, string source,
+    DamageTypes_t type = DamageTypes_t.DMG_BLAST_SURFACE) {
+    if (target.Pawn.Value == null) return;
+
+    var infoSize = Schema.GetClassSize("CTakeDamageInfo");
+    var infoPtr  = Marshal.AllocHGlobal(infoSize);
+
+    for (var i = 0; i < infoSize; i++) Marshal.WriteByte(infoPtr, i, 0);
+
+    var damageInfo = new CTakeDamageInfo(infoPtr);
+
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hInflictor",
+      attacker != null ? attacker.Pawn.Raw : 0);
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo", "m_hAttacker",
+      attacker != null ? attacker.EntityHandle.Raw : 0);
+    damageInfo.Damage         = damage;
+    damageInfo.BitsDamageType = type;
+
+    if (target.Pawn.Value?.AbsOrigin != null)
+      Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
+        "m_vecDamagePosition",
+        target.Pawn.Value != null ?
+          target.Pawn.Value.AbsOrigin.Handle :
+          Vector.Zero.Handle);
+
+    Schema.SetSchemaValue(damageInfo.Handle, "CTakeDamageInfo",
+      "m_vecDamageForce", Vector.Zero.Handle);
+
+    var damageResultSize = Schema.GetClassSize("CTakeDamageResult");
+    var damageResultPtr  = Marshal.AllocHGlobal(damageResultSize);
+    for (var i = 0; i < damageResultSize; i++)
+      Marshal.WriteByte(damageResultPtr, i, 0);
+
+    var damageResult = new CTakeDamageResult(damageResultPtr);
+    Schema.SetSchemaValue(damageResult.Handle, "CTakeDamageResult",
+      "m_pOriginatingInfo", damageInfo.Handle);
+
+    damageResult.HealthLost          = damage;
+    damageResult.DamageDealt         = damage;
+    damageResult.TotalledHealthLost  = damage;
+    damageResult.TotalledDamageDealt = damage;
+    damageResult.WasDamageSuppressed = false;
+
+    if (target.EntityHandle.Value != null)
+      VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Invoke(
+        target.EntityHandle.Value, damageInfo, damageResult);
+
+    Marshal.FreeHGlobal(infoPtr);
+    Marshal.FreeHGlobal(damageResultPtr);
+  }
+}
+
+[StructLayout(LayoutKind.Explicit)]
+public struct CAttackerInfo {
+  [FieldOffset(0x0)]
+  public bool NeedInit;
+
+  [FieldOffset(0x1)]
+  public bool IsPawn;
+
+  [FieldOffset(0x2)]
+  public bool IsWorld;
+
+  [FieldOffset(0x4)]
+  public UInt32 AttackerPawn;
+
+  [FieldOffset(0x8)]
+  public ushort AttackerUserId;
+
+  [FieldOffset(0x0C)]
+  public int TeamChecked;
+
+  [FieldOffset(0x10)]
+  public int TeamNum;
+}
--- a/TTT/CS2/Utils/EntityNameHelper.cs
+++ b/TTT/CS2/Utils/EntityNameHelper.cs
@@ -0,0 +1,24 @@
+using System.Runtime.InteropServices;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+
+namespace TTT.CS2.Utils;
+
+public class EntityNameHelper {
+  private static readonly CEntityIdentity_SetEntityName
+    CEntityIdentity_SetEntityNameFunc;
+
+  static EntityNameHelper() {
+    var setEntityNameSignature = NativeAPI.FindSignature(Addresses.ServerPath,
+      GameData.GetSignature("CEntityIdentity_SetEntityNameFunc"));
+    CEntityIdentity_SetEntityNameFunc =
+      Marshal.GetDelegateForFunctionPointer<CEntityIdentity_SetEntityName>(
+        setEntityNameSignature);
+  }
+
+  private delegate void CEntityIdentity_SetEntityName(IntPtr ptr, string name);
+
+  public static void SetEntityName(CEntityIdentity identity, string name) {
+    CEntityIdentity_SetEntityNameFunc(identity.Handle, name);
+  }
+}
--- a/TTT/CS2/Utils/GrenadeDataHelper.cs
+++ b/TTT/CS2/Utils/GrenadeDataHelper.cs
@@ -0,0 +1,30 @@
+using System.Runtime.InteropServices;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Memory;
+using CounterStrikeSharp.API.Modules.Utils;
+
+namespace TTT.CS2.Utils;
+
+public class GrenadeDataHelper {
+  private static readonly CHEGrenadeProjectile_CreateDelegate
+    CHEGrenadeProjectile_CreateFunc;
+
+  static GrenadeDataHelper() {
+    var heGrenadeSignature = NativeAPI.FindSignature(Addresses.ServerPath,
+      GameData.GetSignature("CHEGrenadeProjectile_CreateFunc"));
+    CHEGrenadeProjectile_CreateFunc =
+      Marshal
+       .GetDelegateForFunctionPointer<CHEGrenadeProjectile_CreateDelegate>(
+          heGrenadeSignature);
+  }
+
+  private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
+    IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
+    int weaponId, byte team);
+
+  public static int CreateGrenade(Vector position, QAngle angle,
+    Vector velocity, Vector velocityAngle, IntPtr thrower, CsTeam team) {
+    return CHEGrenadeProjectile_CreateFunc(position.Handle, angle.Handle,
+      velocity.Handle, velocityAngle.Handle, thrower, 44, (byte)team);
+  }
+}
--- a/TTT/CS2/Utils/RoundUtil.cs
+++ b/TTT/CS2/Utils/RoundUtil.cs
@@ -50,7 +50,8 @@ public static class RoundUtil {

  public static void EndRound(RoundEndReason reason) {
    var gameRules = ServerUtil.GameRulesProxy;
-    if (gameRules == null || gameRules.GameRules == null) return;
+    if (gameRules == null || gameRules.GameRules == null || !gameRules.IsValid)
+      return;
    // TODO: Figure out what these params do
    // TerminateRoundFunc.Invoke(gameRules.GameRules.Handle, 5f, reason, 0, 0);
    VirtualFunctions.TerminateRoundFunc.Invoke(gameRules.GameRules.Handle,
--- a/TTT/CS2/Utils/ServerUtil.cs
+++ b/TTT/CS2/Utils/ServerUtil.cs
@@ -11,7 +11,9 @@ public static class ServerUtil {
         .FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules")
         .FirstOrDefault();

-      return GameRulesProxy?.GameRules;
+      if (GameRulesProxy == null || !GameRulesProxy.IsValid) return null;
+
+      return GameRulesProxy.GameRules;
    }
  }

--- a/TTT/CS2/Utils/TextCompass.cs
+++ b/TTT/CS2/Utils/TextCompass.cs
@@ -0,0 +1,81 @@
+namespace TTT.CS2.Utils;
+
+public static class TextCompass {
+  /// <summary>
+  ///   Builds a compass line with at most one character for each of N, E, S, W.
+  ///   0° = North, 90° = East, angles increase clockwise.
+  /// </summary>
+  /// <param name="fov">Field of view in degrees [0..360].</param>
+  /// <param name="width">Output width in characters.</param>
+  /// <param name="direction">Facing direction in degrees.</param>
+  /// <param name="filler">Filler character for empty slots.</param>
+  /// <param name="targetDir"></param>
+  public static string GenerateCompass(float fov, int width, float direction,
+    char filler = '·', float? targetDir = null) {
+    if (width <= 0) return string.Empty;
+
+    fov       = Math.Clamp(fov, 0.001f, 360f);
+    direction = Normalize(direction);
+
+    var buf                                = new char[width];
+    for (var i = 0; i < width; i++) buf[i] = filler;
+
+    var start      = direction - fov / 2f; // left edge of view
+    var degPerChar = fov / width;
+
+    PlaceIfVisible('N', 0f);
+    PlaceIfVisible('E', 90f);
+    PlaceIfVisible('S', 180f);
+    PlaceIfVisible('W', 270f);
+    if (targetDir.HasValue) PlaceIfVisible('X', targetDir.Value);
+
+    return new string(buf);
+
+    void PlaceIfVisible(char c, float cardinalAngle) {
+      var delta = ForwardDelta(start, cardinalAngle); // [0..360)
+      if (delta < 0f || delta >= fov) return;         // outside view
+
+      // Map degrees to nearest character cell
+      var idx               = (int)MathF.Round(delta / degPerChar);
+      if (idx < 0) idx      = 0;
+      if (idx >= width) idx = width - 1;
+
+      // Nudge left/right to avoid collisions when possible
+      if (buf[idx] == filler) {
+        buf[idx] = c;
+        return;
+      }
+
+      var maxRadius = Math.Max(idx, width - 1 - idx);
+      for (var r = 1; r <= maxRadius; r++) {
+        var left = idx - r;
+        if (left >= 0 && buf[left] == filler) {
+          buf[left] = c;
+          return;
+        }
+
+        var right = idx + r;
+        if (right < width && buf[right] == filler) {
+          buf[right] = c;
+          return;
+        }
+      }
+
+      // If no space, overwrite the original cell as a last resort
+      buf[idx] = c;
+    }
+  }
+
+  private static float Normalize(float angle) {
+    angle %= 360f;
+    return angle < 0 ? angle + 360f : angle;
+  }
+
+  // Delta moving forward from start to target, wrapped to [0..360)
+  private static float ForwardDelta(float start, float target) {
+    var s = Normalize(start);
+    var t = Normalize(target);
+    var d = t - s;
+    return d < 0 ? d + 360f : d;
+  }
+}
--- a/Show More
+++ b/Show More