update: Decrease silent round probability

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to
6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/releases">actions/checkout's
releases</a>.</em></p>
<blockquote>
<h2>v6.0.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Update README to include Node.js 24 support details and requirements
by <a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/2248">actions/checkout#2248</a></li>
<li>Persist creds to a separate file by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2286">actions/checkout#2286</a></li>
<li>v6-beta by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2298">actions/checkout#2298</a></li>
<li>update readme/changelog for v6 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2311">actions/checkout#2311</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v5.0.0...v6.0.0">https://github.com/actions/checkout/compare/v5.0.0...v6.0.0</a></p>
<h2>v6-beta</h2>
<h2>What's Changed</h2>
<p>Updated persist-credentials to store the credentials under
<code>$RUNNER_TEMP</code> instead of directly in the local git
config.</p>
<p>This requires a minimum Actions Runner version of <a
href="https://github.com/actions/runner/releases/tag/v2.329.0">v2.329.0</a>
to access the persisted credentials for <a
href="https://docs.github.com/en/actions/tutorials/use-containerized-services/create-a-docker-container-action">Docker
container action</a> scenarios.</p>
<h2>v5.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Port v6 cleanup to v5 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2301">actions/checkout#2301</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v5...v5.0.1">https://github.com/actions/checkout/compare/v5...v5.0.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/blob/main/CHANGELOG.md">actions/checkout's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
<h2>V6.0.0</h2>
<ul>
<li>Persist creds to a separate file by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2286">actions/checkout#2286</a></li>
<li>Update README to include Node.js 24 support details and requirements
by <a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/2248">actions/checkout#2248</a></li>
</ul>
<h2>V5.0.1</h2>
<ul>
<li>Port v6 cleanup to v5 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2301">actions/checkout#2301</a></li>
</ul>
<h2>V5.0.0</h2>
<ul>
<li>Update actions checkout to use node 24 by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2226">actions/checkout#2226</a></li>
</ul>
<h2>V4.3.1</h2>
<ul>
<li>Port v6 cleanup to v4 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2305">actions/checkout#2305</a></li>
</ul>
<h2>V4.3.0</h2>
<ul>
<li>docs: update README.md by <a
href="https://github.com/motss"><code>@​motss</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1971">actions/checkout#1971</a></li>
<li>Add internal repos for checking out multiple repositories by <a
href="https://github.com/mouismail"><code>@​mouismail</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1977">actions/checkout#1977</a></li>
<li>Documentation update - add recommended permissions to Readme by <a
href="https://github.com/benwells"><code>@​benwells</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2043">actions/checkout#2043</a></li>
<li>Adjust positioning of user email note and permissions heading by <a
href="https://github.com/joshmgross"><code>@​joshmgross</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2044">actions/checkout#2044</a></li>
<li>Update README.md by <a
href="https://github.com/nebuk89"><code>@​nebuk89</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2194">actions/checkout#2194</a></li>
<li>Update CODEOWNERS for actions by <a
href="https://github.com/TingluoHuang"><code>@​TingluoHuang</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/2224">actions/checkout#2224</a></li>
<li>Update package dependencies by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/2236">actions/checkout#2236</a></li>
</ul>
<h2>v4.2.2</h2>
<ul>
<li><code>url-helper.ts</code> now leverages well-known environment
variables by <a href="https://github.com/jww3"><code>@​jww3</code></a>
in <a
href="https://redirect.github.com/actions/checkout/pull/1941">actions/checkout#1941</a></li>
<li>Expand unit test coverage for <code>isGhes</code> by <a
href="https://github.com/jww3"><code>@​jww3</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1946">actions/checkout#1946</a></li>
</ul>
<h2>v4.2.1</h2>
<ul>
<li>Check out other refs/* by commit if provided, fall back to ref by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1924">actions/checkout#1924</a></li>
</ul>
<h2>v4.2.0</h2>
<ul>
<li>Add Ref and Commit outputs by <a
href="https://github.com/lucacome"><code>@​lucacome</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1180">actions/checkout#1180</a></li>
<li>Dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>- <a
href="https://redirect.github.com/actions/checkout/pull/1777">actions/checkout#1777</a>,
<a
href="https://redirect.github.com/actions/checkout/pull/1872">actions/checkout#1872</a></li>
</ul>
<h2>v4.1.7</h2>
<ul>
<li>Bump the minor-npm-dependencies group across 1 directory with 4
updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1739">actions/checkout#1739</a></li>
<li>Bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1697">actions/checkout#1697</a></li>
<li>Check out other refs/* by commit by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1774">actions/checkout#1774</a></li>
<li>Pin actions/checkout's own workflows to a known, good, stable
version. by <a href="https://github.com/jww3"><code>@​jww3</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1776">actions/checkout#1776</a></li>
</ul>
<h2>v4.1.6</h2>
<ul>
<li>Check platform to set archive extension appropriately by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1732">actions/checkout#1732</a></li>
</ul>
<h2>v4.1.5</h2>
<ul>
<li>Update NPM dependencies by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://redirect.github.com/actions/checkout/pull/1703">actions/checkout#1703</a></li>
<li>Bump github/codeql-action from 2 to 3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1694">actions/checkout#1694</a></li>
<li>Bump actions/setup-node from 1 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1696">actions/checkout#1696</a></li>
<li>Bump actions/upload-artifact from 2 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/actions/checkout/pull/1695">actions/checkout#1695</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="1af3b93b68"><code>1af3b93</code></a>
update readme/changelog for v6 (<a
href="https://redirect.github.com/actions/checkout/issues/2311">#2311</a>)</li>
<li><a
href="71cf2267d8"><code>71cf226</code></a>
v6-beta (<a
href="https://redirect.github.com/actions/checkout/issues/2298">#2298</a>)</li>
<li><a
href="069c695914"><code>069c695</code></a>
Persist creds to a separate file (<a
href="https://redirect.github.com/actions/checkout/issues/2286">#2286</a>)</li>
<li><a
href="ff7abcd0c3"><code>ff7abcd</code></a>
Update README to include Node.js 24 support details and requirements (<a
href="https://redirect.github.com/actions/checkout/issues/2248">#2248</a>)</li>
<li>See full diff in <a
href="https://github.com/actions/checkout/compare/v5...v6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=5&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

.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']

.github/workflows/dotnet.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true
@@ -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
@@ -51,7 +51,7 @@ jobs:
       contents: read
       pull-requests: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
@@ -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

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       MAX_CHANGELOG_CHARS: "50000"
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
           fetch-tags: true

LICENSES.MD

@@ -1,20 +1,16 @@
-| Package                                               | Version  | License Information Origin | License Expression | License Url                             | Copyright                                       | Authors                              | Package Project Url                                                                              |
-| ----------------------------------------------------- | -------- | -------------------------- | ------------------ | --------------------------------------- | ----------------------------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------ |
-| CounterStrikeSharp.API                                | 1.0.332  | Expression                 | GPL-3.0-only       | https://licenses.nuget.org/GPL-3.0-only |                                                 | Roflmuffin                           | http://docs.cssharp.dev/                                                                         |
-| 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 |
-| xunit.runner.visualstudio                             | 3.1.3    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson                  |                                                                                                  |
-| xunit.v3                                              | 3.0.0    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson                  |                                                                                                  |
-| YamlDotNet                                            | 16.3.0   | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) Antoine Aubry and contributors    | Antoine Aubry                        | https://github.com/aaubry/YamlDotNet/wiki                                                        |
+| Package                                               | Version  | License Information Origin | License Expression | License Url                             | Copyright                                       | Authors                          | Package Project Url                                                                              |
+| ----------------------------------------------------- | -------- | -------------------------- | ------------------ | --------------------------------------- | ----------------------------------------------- | -------------------------------- | ------------------------------------------------------------------------------------------------ |
+| CounterStrikeSharp.API                                | 1.0.342  | Expression                 | GPL-3.0-only       | https://licenses.nuget.org/GPL-3.0-only |                                                 | Roflmuffin                       | http://docs.cssharp.dev/                                                                         |
+| 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                                                        |
+| 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 |
+| xunit.runner.visualstudio                             | 3.1.3    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson              |                                                                                                  |
+| xunit.v3                                              | 3.0.0    | Expression                 | Apache-2.0         | https://licenses.nuget.org/Apache-2.0   | Copyright (C) .NET Foundation                   | jnewkirk,bradwilson              |                                                                                                  |
+| YamlDotNet                                            | 16.3.0   | Expression                 | MIT                | https://licenses.nuget.org/MIT          | Copyright (c) Antoine Aubry and contributors    | Antoine Aubry                    | https://github.com/aaubry/YamlDotNet/wiki                                                        |

Locale/Locale.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.332"/>
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.346"/>
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.3"/>
     <PackageReference Include="System.Text.Json" Version="8.0.5"/>
     <PackageReference Include="YamlDotNet" Version="16.3.0"/>

README.md

@@ -16,7 +16,9 @@ survive while eliminating the traitors among them.
     - [X] Innocents
 - [X] Shop
 - [X] Karma
-- [ ] Statistics
+- [X] Statistics
+- [X] Map Integrations
+- [X] Special Rounds
 
 ## Versioning
 

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", "TTT\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

TTT/API/Game/IAction.cs

@@ -11,6 +11,7 @@ public interface IAction {
   string Id { get; }
   string Verb { get; }
   string Details { get; }
+  string Prefix => "";
 
   public string Format() {
     var pRole = PlayerRole != null ?
@@ -20,7 +21,7 @@ public interface IAction {
       $" [{OtherRole.Name.First(char.IsAsciiLetter)}]" :
       "";
     return Other is not null ?
-      $"{Player}{pRole} {Verb} {Other}{oRole} {Details}" :
-      $"{Player}{pRole} {Verb} {Details}";
+      $"{Prefix}{Player}{pRole} {Verb} {Other}{oRole} {Details}" :
+      $"{Prefix}{Player}{pRole} {Verb} {Details}";
   }
 }

TTT/API/Game/IActionLogger.cs

@@ -18,4 +18,6 @@ public interface IActionLogger {
 
   void PrintLogs();
   void PrintLogs(IOnlinePlayer? player);
+
+  string[] MakeLogs();
 }

TTT/API/Player/IIconManager.cs

@@ -12,6 +12,7 @@ public interface IIconManager {
   void AddVisiblePlayer(int client, int player);
   void RemoveVisiblePlayer(int client, int player);
   void SetVisiblePlayers(IOnlinePlayer online, ulong playersBitmask);
+  void RevealToAll(IOnlinePlayer online);
 
   void ClearAllVisibility();
 }

TTT/API/Player/IMuted.cs

@@ -0,0 +1,3 @@
+namespace TTT.API.Player;
+
+public interface IMuted : ISet<string> { }

TTT/API/Player/IPlayer.cs

@@ -7,7 +7,7 @@ public interface IPlayer : IEquatable<IPlayer> {
   /// </summary>
   string Id { get; }
 
-  string Name { get; }
+  string Name { get; set; }
 
   bool IEquatable<IPlayer>.Equals(IPlayer? other) {
     if (other is null) return false;

TTT/API/Player/IPlayerFinder.cs

@@ -21,4 +21,55 @@ public interface IPlayerFinder {
     var matches = GetOnline().Where(p => p.Name.Contains(name)).ToList();
     return matches.Count == 1 ? matches[0] : null;
   }
+
+  List<IOnlinePlayer> GetMulti(string query, out string name,
+    IOnlinePlayer? executor = null) {
+    var result = query switch {
+      "@all" => GetOnline().ToList(),
+      "@me"  => executor != null ? new List<IOnlinePlayer> { executor } : [],
+      "@!me" => executor != null ?
+        GetOnline().Where(p => p.Id != executor.Id).ToList() :
+        GetOnline().ToList(),
+      _ => GetSingle(query) != null ?
+        new List<IOnlinePlayer> { GetSingle(query)! } : []
+    };
+
+    name = "no players found";
+    name = query switch {
+      "@all" => "all players",
+      "@me"  => executor != null ? executor.Name : "no one",
+      "@!me" => executor != null ?
+        $"all players except {executor.Name}" :
+        "all players",
+      _ => GetSingle(query) != null ?
+        GetSingle(query)!.Name :
+        "no players found"
+    };
+
+    return result;
+  }
+
+  IOnlinePlayer? GetSingle(string query) {
+    if (query.StartsWith("#")) {
+      var id   = query[1..];
+      var byId = GetPlayerById(id);
+      if (byId != null) return byId;
+      var byName = GetOnline().FirstOrDefault(p => p.Name == id);
+      return byName;
+    }
+
+    var byNameExact = GetOnline().FirstOrDefault(p => p.Name == query);
+    if (byNameExact != null) return byNameExact;
+
+    var contains = GetOnline().Where(p => p.Name.Contains(query)).ToList();
+
+    if (contains.Count == 1) return contains[0];
+
+    contains = GetOnline()
+     .Where(p
+        => p.Name.Contains(query, StringComparison.InvariantCultureIgnoreCase))
+     .ToList();
+
+    return contains.Count == 1 ? contains[0] : null;
+  }
 }

TTT/CS2/API/Items/ITripwireActivator.cs

@@ -0,0 +1,5 @@
+namespace TTT.CS2.API.Items;
+
+public interface ITripwireActivator {
+  public void ActivateTripwire(TripwireInstance tripwire);
+}

TTT/CS2/API/Items/ITripwireTracker.cs

@@ -0,0 +1,6 @@
+namespace TTT.CS2.API.Items;
+
+public interface ITripwireTracker {
+  public List<TripwireInstance> ActiveTripwires { get; }
+  void RemoveTripwire(TripwireInstance instance);
+}

TTT/CS2/API/Items/TripwireInstance.cs

@@ -0,0 +1,13 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+using TTT.API.Player;
+
+namespace TTT.CS2.API.Items;
+
+public record TripwireInstance(IOnlinePlayer owner, CEnvBeam Beam,
+  CDynamicProp TripwireProp, Vector StartPos, Vector EndPos) {
+  public override string ToString() {
+    return
+      $"TripwireInstance(Owner={owner}, StartPos={StartPos}, EndPos={EndPos})";
+  }
+}

TTT/CS2/Actions/TaserAction.cs

@@ -0,0 +1,19 @@
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Role;
+
+namespace TTT.CS2.Actions;
+
+public class TaserAction(IRoleAssigner roles, IPlayer victim,
+  IPlayer identifier) : IAction {
+  public IPlayer Player { get; } = identifier;
+  public IPlayer? Other { get; } = victim;
+
+  public IRole? PlayerRole { get; } =
+    roles.GetRoles(identifier).FirstOrDefault();
+
+  public IRole? OtherRole { get; } = roles.GetRoles(victim).FirstOrDefault();
+  public string Id { get; } = "cs2.action.tased";
+  public string Verb { get; } = "tased";
+  public string Details { get; } = "";
+}

TTT/CS2/CS2.csproj

@@ -13,6 +13,7 @@
     <ProjectReference Include="..\Game\Game.csproj"/>
     <ProjectReference Include="..\Karma\Karma.csproj"/>
     <ProjectReference Include="..\ShopAPI\ShopAPI.csproj"/>
+    <ProjectReference Include="..\SpecialRoundAPI\SpecialRoundAPI.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

TTT/CS2/CS2ServiceCollection.cs

@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
 using ShopAPI.Configs;
+using ShopAPI.Configs.Detective;
 using ShopAPI.Configs.Traitor;
 using TTT.API.Command;
 using TTT.API.Extensions;
@@ -49,42 +51,61 @@ public static class CS2ServiceCollection {
     collection
      .AddModBehavior<IStorage<PoisonSmokeConfig>, CS2PoisonSmokeConfig>();
     collection.AddModBehavior<IStorage<KarmaConfig>, CS2KarmaConfig>();
+    collection.AddModBehavior<IStorage<CamoConfig>, CS2CamoConfig>();
+    collection.AddModBehavior<IStorage<StickersConfig>, CS2StickersConfig>();
+    collection.AddModBehavior<IStorage<BodyPaintConfig>, CS2BodyPaintConfig>();
+    collection
+     .AddModBehavior<IStorage<DnaScannerConfig>, CS2DnaScannerConfig>();
+    collection
+     .AddModBehavior<IStorage<HealthStationConfig>, CS2HealthStationConfig>();
+    collection
+     .AddModBehavior<IStorage<ClusterGrenadeConfig>, CS2ClusterGrenadeConfig>();
+    collection.AddModBehavior<IStorage<GlovesConfig>, CS2GlovesConfig>();
+    collection
+     .AddModBehavior<IStorage<OneHitKnifeConfig>, CS2OneHitKnifeConfig>();
+    collection.AddModBehavior<IStorage<SilentAWPConfig>, CS2SilentAWPConfig>();
+    collection
+     .AddModBehavior<IStorage<HealthshotConfig>, CS2HealthshotConfig>();
+    collection.AddModBehavior<IStorage<TripwireConfig>, CS2TripwireConfig>();
 
     // TTT - CS2 Specific optionals
     collection.AddScoped<ITextSpawner, TextSpawner>();
 
     // GameHandlers
     collection.AddModBehavior<BodySpawner>();
+    collection.AddModBehavior<BombPlantSuppressor>();
+    collection.AddModBehavior<BuyMenuHandler>();
     collection.AddModBehavior<CombatHandler>();
     collection.AddModBehavior<DamageCanceler>();
+    collection.AddModBehavior<MapChangeCausesEndListener>();
+    collection.AddModBehavior<MapZoneRemover>();
+    collection.AddModBehavior<NameUpdater>();
     collection.AddModBehavior<PlayerConnectionsHandler>();
+    collection.AddModBehavior<PlayerMuter>();
     collection.AddModBehavior<PropMover>();
     collection.AddModBehavior<RoundStart_GameStartHandler>();
-    collection.AddModBehavior<BombPlantSuppressor>();
-    collection.AddModBehavior<MapZoneRemover>();
-    collection.AddModBehavior<BuyMenuHandler>();
     collection.AddModBehavior<TeamChangeHandler>();
     collection.AddModBehavior<TraitorChatHandler>();
-    collection.AddModBehavior<PlayerMuter>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();
     collection.AddModBehavior<TaserListenCanceler>();
 
     // Listeners
+    collection.AddModBehavior<AfkTimerListener>();
     collection.AddModBehavior<BodyPickupListener>();
     collection.AddModBehavior<IBodyTracker, BodyTracker>();
+    collection.AddModBehavior<KarmaBanner>();
+    collection.AddModBehavior<KarmaSyncer>();
     collection.AddModBehavior<LateSpawnListener>();
+    collection.AddModBehavior<MapHookListener>();
     collection.AddModBehavior<PlayerStatsTracker>();
     collection.AddModBehavior<RoundTimerListener>();
     collection.AddModBehavior<ScreenColorApplier>();
-    collection.AddModBehavior<KarmaBanner>();
-    collection.AddModBehavior<KarmaSyncer>();
+    collection.AddModBehavior<WardenTagAssigner>();
 
     // Commands
-#if DEBUG
     collection.AddModBehavior<TestCommand>();
-#endif
 
     collection.AddScoped<IGameManager, CS2GameManager>();
     collection.AddScoped<IInventoryManager, CS2InventoryManager>();

TTT/CS2/Command/CS2CommandManager.cs

@@ -6,8 +6,8 @@ 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;
 
 namespace TTT.CS2.Command;
 

TTT/CS2/Command/PlayerPingShopAlias.cs

@@ -41,15 +41,15 @@ public class PlayerPingShopAlias(IServiceProvider provider) : IPluginModule {
 
   private void onButton(CCSPlayerController? player, int index) {
     if (player == null) return;
-    if (converter.GetPlayer(player) is not IOnlinePlayer gamePlayer) return;
+    if (converter.GetPlayer(player) is not IOnlinePlayer apiPlayer) return;
 
-    var lastUpdated = itemSorter.GetLastUpdate(gamePlayer);
+    var lastUpdated = itemSorter.GetLastUpdate(apiPlayer);
     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;
+    var cmdInfo = new CS2CommandInfo(provider, apiPlayer, 0, "css_shop", "buy",
+      (index - 1).ToString()) { CallingContext = CommandCallingContext.Chat };
     provider.GetRequiredService<ICommandManager>().ProcessCommand(cmdInfo);
+    itemSorter.InvalidateOrder(apiPlayer);
   }
 }

TTT/CS2/Command/Test/GiveItemCommand.cs

@@ -1,9 +1,7 @@
 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;
@@ -33,32 +31,23 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
       return Task.FromResult(CommandResult.ERROR);
     }
 
-    var target = executor;
+    List<IOnlinePlayer> targets = [executor];
 
     Server.NextWorldUpdateAsync(() => {
-      if (info.ArgCount == 3) {
-        var result = finder.GetPlayerByName(info.Args[2]);
-        if (result == null) {
-          info.ReplySync($"Player '{info.Args[2]}' not found.");
-          return;
-        }
+      var name = executor.Name;
+      if (info.ArgCount == 3)
+        targets = finder.GetMulti(info.Args[2], out name, executor);
+      foreach (var player in targets) shop.GiveItem(player, item);
 
-        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}.");
+      info.ReplySync($"Gave item '{item.Name}' to {name}.");
     });
     return Task.FromResult(CommandResult.SUCCESS);
   }
 
   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;
 

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 {
+  private BasePlugin? plugin;
+  public void Dispose() { }
+  public void Start() { }
+
+  public string Id => "reload";
+
+  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);
+  }
+
+  public void Start(BasePlugin? plugin) {
+    if (plugin == null) return;
+    this.plugin = plugin;
+  }
+}

TTT/CS2/Command/Test/SetRoleCommand.cs

@@ -15,6 +15,9 @@ public class SetRoleCommand(IServiceProvider provider) : ICommand {
 
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
+  private readonly IPlayerFinder finder =
+    provider.GetRequiredService<IPlayerFinder>();
+
   public void Dispose() { }
 
   public string Id => "setrole";
@@ -24,7 +27,10 @@ public class SetRoleCommand(IServiceProvider provider) : ICommand {
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
 
-    IRole roleToAssign = new TraitorRole(provider);
+    // IOnlinePlayer targetPlayer = executor;
+    List<IOnlinePlayer> targets      = [executor];
+    var                 targetName   = executor.Name;
+    IRole               roleToAssign = new TraitorRole(provider);
     if (info.ArgCount == 2)
       switch (info.Args[1].ToLowerInvariant()) {
         case "d" or "det" or "detective" or "ct":
@@ -33,18 +39,29 @@ public class SetRoleCommand(IServiceProvider provider) : ICommand {
         case "i" or "inn" or "innocent":
           roleToAssign = new InnocentRole(provider);
           break;
+        default:
+          targets = finder.GetMulti(info.Args[1], out targetName, executor);
+          break;
       }
 
+    if (info.ArgCount == 3)
+      targets = finder.GetMulti(info.Args[2], out targetName, executor);
+
     Server.NextWorldUpdate(() => {
-      var ev = new PlayerRoleAssignEvent(executor, roleToAssign);
-      bus.Dispatch(ev);
-      if (ev.IsCanceled) {
-        info.ReplySync("Role assignment was canceled.");
-        return;
+      foreach (var player in targets) {
+        var ev = new PlayerRoleAssignEvent(player, roleToAssign);
+        bus.Dispatch(ev);
+        if (ev.IsCanceled) {
+          info.ReplySync("Role assignment was canceled.");
+          return;
+        }
+
+        assigner.Write(player, [ev.Role]);
+        ev.Role.OnAssign(player);
       }
 
-      assigner.Write(executor, [ev.Role]);
-      ev.Role.OnAssign(executor);
+      info.ReplySync(
+        "Assigned " + roleToAssign.Name + " to " + targetName + ".");
     });
     return Task.FromResult(CommandResult.SUCCESS);
   }

TTT/CS2/Command/Test/SetTargetCommand.cs

@@ -0,0 +1,29 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+
+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;
+      gamePlayer.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/SpecCommand.cs

@@ -0,0 +1,43 @@
+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 string Id => "spec";
+
+  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);
+  }
+}

TTT/CS2/Command/Test/SpecialRoundCommand.cs

@@ -0,0 +1,49 @@
+using CounterStrikeSharp.API;
+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.GetService<ISpecialRoundStarter>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public string Id => "specialround";
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (tracker == null) {
+      info.ReplySync("Special round tracker is not available.");
+      return Task.FromResult(CommandResult.ERROR);
+    }
+
+    if (info.ArgCount == 1) {
+      Server.NextWorldUpdate(() => tracker.TryStartSpecialRound());
+      info.ReplySync("Started a random special round.");
+      return Task.FromResult(CommandResult.SUCCESS);
+    }
+
+    var rounds = provider.GetServices<ITerrorModule>()
+     .OfType<AbstractSpecialRound>()
+     .ToDictionary(r => r.Name.ToLower().Replace(" ", ""), r => r);
+
+    var roundName = string.Join("", info.Args.Skip(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);
+    }
+
+    Server.NextWorldUpdate(() => {
+      tracker.TryStartSpecialRound([round]);
+      info.ReplySync($"Started special round '{roundName}'.");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/TestCommand.cs

@@ -26,12 +26,19 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
     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(

TTT/CS2/Configs/CS2GameConfig.cs

@@ -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(
@@ -48,36 +48,34 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
 
   public static readonly FakeConVar<int> CV_TRAITOR_ARMOR = new(
     "css_ttt_rolearmor_traitor",
-    "Amount of armor to give to traitors at start of round", 100,
+    "Amount of armor to give to traitors at start of round", 0,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
 
   public static readonly FakeConVar<int> CV_DETECTIVE_ARMOR = new(
     "css_ttt_rolearmor_detective",
-    "Amount of armor to give to detectives at start of round", 100,
+    "Amount of armor to give to detectives at start of round", 0,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
 
   public static readonly FakeConVar<int> CV_INNOCENT_ARMOR = new(
     "css_ttt_rolearmor_innocent",
-    "Amount of armor to give to innocents at start of round", 100,
+    "Amount of armor to give to innocents at start of round", 0,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 1000));
 
   public static readonly FakeConVar<string> CV_TRAITOR_WEAPONS = new(
     "css_ttt_roleweapons_traitor",
-    "Weapons available to traitors at start of round",
-    "weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
-    new ItemValidator(allowMultiple: true));
+    "Weapons available to traitors at start of round", "",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_DETECTIVE_WEAPONS = new(
     "css_ttt_roleweapons_detective",
     "Weapons available to detectives at start of round",
-    "weapon_knife,weapon_taser,weapon_m4a1,weapon_revolver",
-    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
+    "weapon_taser,weapon_m4a1_silencer,weapon_revolver", ConVarFlags.FCVAR_NONE,
+    new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_INNOCENT_WEAPONS = new(
     "css_ttt_roleweapons_innocent",
-    "Weapons available to innocents at start of round",
-    "weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
-    new ItemValidator(allowMultiple: true));
+    "Weapons available to innocents at start of round", "",
+    ConVarFlags.FCVAR_NONE, 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", 1,

TTT/CS2/Configs/CS2KarmaConfig.cs

@@ -44,7 +44,7 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
   // 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,
+    "Karma gained when Innocent kills a Traitor", 2, ConVarFlags.FCVAR_NONE,
     new RangeValidator<int>(-50, 50));
 
   public static readonly FakeConVar<int> CV_TRAITOR_ON_DETECTIVE = new(
@@ -55,32 +55,32 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
   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));
+    -2, 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,
+    "Karma lost when Innocent kills another Innocent", -8,
     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));
+    "Karma lost when Traitor kills another Traitor", -12,
+    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,
+    "Karma lost when Innocent kills a Detective", -15, 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,
+    "Amount of karma a player will gain at the end of each round", 1,
     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));
+    1, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
 
   public void Dispose() { }
 

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(

TTT/CS2/Configs/ShopItems/CS2BodyPaintConfig.cs

@@ -0,0 +1,52 @@
+using System.Drawing;
+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 CS2BodyPaintConfig : IStorage<BodyPaintConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_bodypaint_price", "Price of the Body Paint item", 30,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_MAX_USES = new(
+    "css_ttt_shop_bodypaint_max_uses",
+    "Maximum number of times the Body Paint can be applied per item", 4,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 100));
+
+  public static readonly FakeConVar<string> CV_COLOR = new(
+    "css_ttt_shop_bodypaint_color",
+    "Color to apply to the player's body (HTML hex or known color name)",
+    "GreenYellow");
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<BodyPaintConfig?> Load() {
+    Color parsedColor;
+    try { parsedColor = ColorTranslator.FromHtml(CV_COLOR.Value); } catch {
+      try { parsedColor = Color.FromName(CV_COLOR.Value); } catch {
+        parsedColor = Color.GreenYellow;
+      }
+    }
+
+    var cfg = new BodyPaintConfig {
+      Price        = CV_PRICE.Value,
+      MaxUses      = CV_MAX_USES.Value,
+      ColorToApply = parsedColor
+    };
+
+    return Task.FromResult<BodyPaintConfig?>(cfg);
+  }
+}

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.5f, 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);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2ClusterGrenadeConfig.cs

@@ -0,0 +1,56 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2ClusterGrenadeConfig : IStorage<ClusterGrenadeConfig>,
+  IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_clustergrenade_price",
+    "Price of the Cluster Grenade item (Traitor)", 100, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_GRENADE_COUNT = new(
+    "css_ttt_shop_clustergrenade_count",
+    "Number of grenades released upon explosion", 8, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(1, 50));
+
+  public static readonly FakeConVar<string> CV_WEAPON_ID = new(
+    "css_ttt_shop_clustergrenade_weapon",
+    "Weapon entity ID used for the Cluster Grenade", "weapon_hegrenade");
+
+  public static readonly FakeConVar<float> CV_UP_FORCE = new(
+    "css_ttt_shop_clustergrenade_up_force",
+    "Upward force applied to cluster fragments", 200f, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<float>(0f, 1000f));
+
+  public static readonly FakeConVar<float> CV_THROW_FORCE = new(
+    "css_ttt_shop_clustergrenade_throw_force",
+    "Forward throw force applied to cluster fragments", 250f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1000f));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<ClusterGrenadeConfig?> Load() {
+    var cfg = new ClusterGrenadeConfig {
+      Price        = CV_PRICE.Value,
+      GrenadeCount = CV_GRENADE_COUNT.Value,
+      UpForce      = CV_UP_FORCE.Value,
+      ThrowForce   = CV_THROW_FORCE.Value
+    };
+
+    return Task.FromResult<ClusterGrenadeConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2DnaScannerConfig.cs

@@ -0,0 +1,44 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs.Detective;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2DnaScannerConfig : IStorage<DnaScannerConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_dna_price", "Price of the DNA Scanner item (Detective)", 110,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_MAX_SAMPLES = new(
+    "css_ttt_shop_dna_max_samples",
+    "Maximum number of DNA samples that can be stored at once", 0,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 100));
+
+  public static readonly FakeConVar<int> CV_DECAY_TIME_SECONDS = new(
+    "css_ttt_shop_dna_decay_time",
+    "Time (in seconds) before a DNA sample decays", 120, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(10, 3600));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<DnaScannerConfig?> Load() {
+    var cfg = new DnaScannerConfig {
+      Price      = CV_PRICE.Value,
+      MaxSamples = CV_MAX_SAMPLES.Value,
+      DecayTime  = TimeSpan.FromSeconds(CV_DECAY_TIME_SECONDS.Value)
+    };
+
+    return Task.FromResult<DnaScannerConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2GlovesConfig.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.Traitor;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2GlovesConfig : IStorage<GlovesConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_gloves_price", "Price of the Gloves item (Traitor)", 40,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_MAX_USES = new(
+    "css_ttt_shop_gloves_max_uses",
+    "Maximum number of times the Gloves can be used before breaking", 5,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 100));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<GlovesConfig?> Load() {
+    var cfg = new GlovesConfig {
+      Price = CV_PRICE.Value, MaxUses = CV_MAX_USES.Value
+    };
+
+    return Task.FromResult<GlovesConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2HealthStationConfig.cs

@@ -0,0 +1,69 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs.Detective;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2HealthStationConfig : IStorage<HealthStationConfig>,
+  IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_healthstation_price",
+    "Price of the Health Station item (Detective)", 50, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<string> CV_USE_SOUND = new(
+    "css_ttt_shop_healthstation_use_sound",
+    "Sound played when using the Health Station", "sounds/buttons/blip1");
+
+  public static readonly FakeConVar<int> CV_HEALTH_INCREMENTS = new(
+    "css_ttt_shop_healthstation_increments",
+    "Number of health increments applied per use", 10, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(1, 100));
+
+  public static readonly FakeConVar<int> CV_HEALTH_INTERVAL = new(
+    "css_ttt_shop_healthstation_interval",
+    "Interval (in seconds) between health increments", 1,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 60));
+
+  public static readonly FakeConVar<int> CV_STATION_HEALTH = new(
+    "css_ttt_shop_healthstation_station_health",
+    "Maximum health of the station object itself", 200, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(50, 1000));
+
+  public static readonly FakeConVar<int> CV_TOTAL_HEALTH_GIVEN = new(
+    "css_ttt_shop_healthstation_total_health_given",
+    "Total health the station can provide before depleting (0 = infinite)", 0,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<float> CV_MAX_RANGE = new(
+    "css_ttt_shop_healthstation_max_range",
+    "Maximum range (in units) from which players can use the station", 256f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(50f, 2048f));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<HealthStationConfig?> Load() {
+    var cfg = new HealthStationConfig {
+      Price            = CV_PRICE.Value,
+      UseSound         = CV_USE_SOUND.Value,
+      HealthIncrements = CV_HEALTH_INCREMENTS.Value,
+      HealthInterval   = TimeSpan.FromSeconds(CV_HEALTH_INTERVAL.Value),
+      StationHealth    = CV_STATION_HEALTH.Value,
+      TotalHealthGiven = CV_TOTAL_HEALTH_GIVEN.Value,
+      MaxRange         = CV_MAX_RANGE.Value
+    };
+
+    return Task.FromResult<HealthStationConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2HealthshotConfig.cs

@@ -0,0 +1,43 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2HealthshotConfig : IStorage<HealthshotConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_healthshot_price", "Price of the Healthshot item", 40,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_MAX_PURCHASES = new(
+    "css_ttt_shop_healthshot_max_purchases",
+    "Maximum number of times a player can purchase the Healthshot per round", 2,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 100));
+
+  public static readonly FakeConVar<string> CV_WEAPON = new(
+    "css_ttt_shop_healthshot_weapon", "Weapon entity name for the Healthshot",
+    "weapon_healthshot");
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<HealthshotConfig?> Load() {
+    var cfg = new HealthshotConfig {
+      Price        = CV_PRICE.Value,
+      MaxPurchases = CV_MAX_PURCHASES.Value,
+      Weapon       = CV_WEAPON.Value
+    };
+
+    return Task.FromResult<HealthshotConfig?>(cfg);
+  }
+}

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", 75,
+    "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(

TTT/CS2/Configs/ShopItems/CS2OneHitKnifeConfig.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.Traitor;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2OneHitKnifeConfig : IStorage<OneHitKnifeConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_onehitknife_price",
+    "Price of the One-Hit Knife item (Traitor)", 80, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
+    "css_ttt_shop_onehitknife_friendly_fire",
+    "Whether the One-Hit Knife can damage teammates");
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<OneHitKnifeConfig?> Load() {
+    var cfg = new OneHitKnifeConfig {
+      Price = CV_PRICE.Value, FriendlyFire = CV_FRIENDLY_FIRE.Value
+    };
+
+    return Task.FromResult<OneHitKnifeConfig?>(cfg);
+  }
+}

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", 110,
+    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 130,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(

TTT/CS2/Configs/ShopItems/CS2SilentAWPConfig.cs

@@ -0,0 +1,54 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2SilentAWPConfig : IStorage<SilentAWPConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_silentawp_price", "Price of the Silent AWP item (Traitor)",
+    80, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_WEAPON_INDEX = new(
+    "css_ttt_shop_silentawp_index", "Weapon slot index for the Silent AWP", 9,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 64));
+
+  public static readonly FakeConVar<string> CV_WEAPON_ID = new(
+    "css_ttt_shop_silentawp_weapon", "Weapon entity ID for the Silent AWP",
+    "weapon_awp");
+
+  public static readonly FakeConVar<int> CV_RESERVE_AMMO = new(
+    "css_ttt_shop_silentawp_reserve_ammo",
+    "Reserve ammo count for the Silent AWP", 0, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(0, 100));
+
+  public static readonly FakeConVar<int> CV_CURRENT_AMMO = new(
+    "css_ttt_shop_silentawp_current_ammo",
+    "Current ammo loaded in the Silent AWP", 1, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(0, 10));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<SilentAWPConfig?> Load() {
+    var cfg = new SilentAWPConfig {
+      Price       = CV_PRICE.Value,
+      WeaponIndex = CV_WEAPON_INDEX.Value,
+      WeaponId    = CV_WEAPON_ID.Value,
+      ReserveAmmo = CV_RESERVE_AMMO.Value,
+      CurrentAmmo = CV_CURRENT_AMMO.Value
+    };
+
+    return Task.FromResult<SilentAWPConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2StickersConfig.cs

@@ -0,0 +1,30 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs.Detective;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2StickersConfig : IStorage<StickersConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_stickers_price", "Price of the Stickers item (Detective)", 45,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<StickersConfig?> Load() {
+    var cfg = new StickersConfig { Price = CV_PRICE.Value };
+
+    return Task.FromResult<StickersConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2TaserConfig.cs

@@ -7,11 +7,11 @@ using TTT.API;
 using TTT.API.Storage;
 using TTT.CS2.Validators;
 
-namespace TTT.CS2.Configs;
+namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2TaserConfig : IStorage<TaserConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_taser_price", "Price of the Taser item", 100,
+    "css_ttt_shop_taser_price", "Price of the Taser item", 110,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<string> CV_WEAPON = new(

TTT/CS2/Configs/ShopItems/CS2TripwireConfig.cs

@@ -0,0 +1,116 @@
+using System.Drawing;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Cvars;
+using CounterStrikeSharp.API.Modules.Cvars.Validators;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Storage;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2TripwireConfig : IStorage<TripwireConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_tripwire_price", "Price of the Tripwire item (Traitor)", 45,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<int> CV_EXPLOSION_POWER = new(
+    "css_ttt_shop_tripwire_explosion_power",
+    "Explosion power of the Tripwire in damage units", 1000,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 10000));
+
+  public static readonly FakeConVar<float> CV_FALLOFF_DELAY = new(
+    "css_ttt_shop_tripwire_falloff_delay",
+    "Damage falloff of tripwire explosion, higher = quicker falloff", 0.015f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
+
+  public static readonly FakeConVar<float> CV_FF_MULTIPLIER = new(
+    "css_ttt_shop_tripwire_friendlyfire_multiplier",
+    "Damage multiplier applied to friendly fire from Tripwire", 0.5f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
+
+  public static readonly FakeConVar<bool> CV_FF_TRIGGERS = new(
+    "css_ttt_shop_tripwire_friendlyfire_triggers",
+    "Whether Tripwires can be triggered by teammates", true);
+
+  public static readonly FakeConVar<float> CV_MAX_DISTANCE_SQUARED = new(
+    "css_ttt_shop_tripwire_max_distance_squared",
+    "Maximum placement distance squared for Tripwire", 50000f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1000000f));
+
+  public static readonly FakeConVar<float> CV_INITIATION_TIME = new(
+    "css_ttt_shop_tripwire_initiation_time",
+    "Seconds before Tripwire becomes active", 2f, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<float>(0f, 10f));
+
+  public static readonly FakeConVar<float> CV_SIZE_SQUARED = new(
+    "css_ttt_shop_tripwire_size_squared",
+    "Size of tripwire for the purposes of bullet/defuse-detection", 10f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(1f, 100000f));
+
+  public static readonly FakeConVar<int> CV_COLOR_R = new(
+    "css_ttt_shop_tripwire_color_r", "Tripwire color red channel (0–255)", 255,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
+
+  public static readonly FakeConVar<int> CV_COLOR_G = new(
+    "css_ttt_shop_tripwire_color_g", "Tripwire color green channel (0–255)", 0,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
+
+  public static readonly FakeConVar<int> CV_COLOR_B = new(
+    "css_ttt_shop_tripwire_color_b", "Tripwire color blue channel (0–255)", 0,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
+
+  public static readonly FakeConVar<int> CV_COLOR_A = new(
+    "css_ttt_shop_tripwire_color_a", "Tripwire color alpha (0–255)", 32,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 255));
+
+  public static readonly FakeConVar<float> CV_THICKNESS = new(
+    "css_ttt_shop_tripwire_thickness", "Visual thickness of the Tripwire beam",
+    0.5f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0.01f, 5f));
+
+  public static readonly FakeConVar<float> CV_DEFUSE_TIME = new(
+    "css_ttt_shop_tripwire_defuse_time",
+    "Time required to fully defuse the Tripwire (in seconds)", 6f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 30f));
+
+  public static readonly FakeConVar<float> CV_DEFUSE_RATE = new(
+    "css_ttt_shop_tripwire_defuse_rate",
+    "Rate at which Tripwire defuses are processed (in seconds)", 0.5f,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0.01f, 5f));
+
+  public static readonly FakeConVar<int> CV_DEFUSE_REWARD = new(
+    "css_ttt_shop_tripwire_defuse_reward",
+    "Amount of money rewarded to a player for successfully defusing a tripwire",
+    20, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<TripwireConfig?> Load() {
+    var cfg = new TripwireConfig {
+      Price = CV_PRICE.Value,
+      ExplosionPower = CV_EXPLOSION_POWER.Value,
+      FalloffDelay = CV_FALLOFF_DELAY.Value,
+      FriendlyFireMultiplier = CV_FF_MULTIPLIER.Value,
+      FriendlyFireTriggers = CV_FF_TRIGGERS.Value,
+      MaxPlacementDistanceSquared = CV_MAX_DISTANCE_SQUARED.Value,
+      TripwireInitiationTime = TimeSpan.FromSeconds(CV_INITIATION_TIME.Value),
+      TripwireSizeSquared = CV_SIZE_SQUARED.Value,
+      TripwireColor =
+        Color.FromArgb(CV_COLOR_A.Value, CV_COLOR_R.Value, CV_COLOR_G.Value,
+          CV_COLOR_B.Value),
+      TripwireThickness = CV_THICKNESS.Value,
+      DefuseTime        = TimeSpan.FromSeconds(CV_DEFUSE_TIME.Value),
+      DefuseRate        = TimeSpan.FromSeconds(CV_DEFUSE_RATE.Value),
+      DefuseReward      = CV_DEFUSE_REWARD.Value
+    };
+
+    return Task.FromResult<TripwireConfig?>(cfg);
+  }
+}

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;
 
@@ -107,4 +108,22 @@ 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) {
+    return new RecipientFilter(slot);
+  }
+
+  private static RecipientFilter OTHERS(int slot) {
+    return new RecipientFilter(ulong.MaxValue & ~(1ul << slot));
+  }
 }

TTT/CS2/Extensions/VectorExtensions.cs

@@ -97,4 +97,11 @@ public static class VectorExtensions {
   public static Vector toVector(this Vector3 vec) {
     return new Vector(vec.X, vec.Y, vec.Z);
   }
+
+  public static QAngle toAngle(this Vector vec) {
+    var pitch = (float)(Math.Atan2(-vec.Z,
+      Math.Sqrt(vec.X * vec.X + vec.Y * vec.Y)) * (180.0 / Math.PI));
+    var yaw = (float)(Math.Atan2(vec.Y, vec.X) * (180.0 / Math.PI));
+    return new QAngle(pitch, yaw, 0);
+  }
 }

TTT/CS2/Game/CS2Game.cs

@@ -10,6 +10,7 @@ using TTT.CS2.Roles;
 using TTT.CS2.Utils;
 using TTT.Game;
 using TTT.Game.Events.Game;
+using TTT.Game.lang;
 using TTT.Game.Roles;
 
 namespace TTT.CS2.Game;

TTT/CS2/GameHandlers/BodySpawner.cs

@@ -6,18 +6,17 @@ using CounterStrikeSharp.API.Modules.Entities.Constants;
 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.Extensions;
 using TTT.Game.Events.Body;
-using TTT.Game.Events.Player;
-using TTT.Game.Listeners;
 using TTT.Game.Roles;
 
 namespace TTT.CS2.GameHandlers;
 
-public class BodySpawner(IServiceProvider provider) : BaseListener(provider) {
+public class BodySpawner(IServiceProvider provider) : IPluginModule {
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
@@ -26,37 +25,31 @@ public class BodySpawner(IServiceProvider provider) : BaseListener(provider) {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
-  [UsedImplicitly]
-  [EventHandler]
-  public void OnLeave(PlayerLeaveEvent ev) {
-    if (games.ActiveGame is not { State: State.IN_PROGRESS }) return;
-    spawnRagdoll(ev.Player);
-  }
+  public void Dispose() { }
+  public void Start() { }
 
   [UsedImplicitly]
-  [EventHandler]
-  public void OnDeath(PlayerDeathEvent ev) {
-    if (games.ActiveGame is not { State: State.IN_PROGRESS }) return;
-    spawnRagdoll(ev.Player, ev.Killer, ev.Weapon);
-  }
-
-  private void spawnRagdoll(IPlayer apiPlayer, IOnlinePlayer? killer = null,
-    string? weapon = null) {
-    var player = converter.GetPlayer(apiPlayer);
-    if (player == null || !player.IsValid) return;
+  [GameEventHandler]
+  public HookResult OnDeath(EventPlayerDeath ev, GameEventInfo _) {
+    if (games.ActiveGame is not { State: State.IN_PROGRESS })
+      return HookResult.Continue;
+    var player = ev.Userid;
+    if (player == null || !player.IsValid) return HookResult.Continue;
     player.SetColor(Color.FromArgb(0, 255, 255, 255));
 
     var ragdollBody = makeGameRagdoll(player);
     var body        = new CS2Body(ragdollBody, converter.GetPlayer(player));
 
-    if (killer != null) body.WithKiller(killer);
+    if (ev.Attacker != null && ev.Attacker.IsValid)
+      body.WithKiller(converter.GetPlayer(ev.Attacker));
 
-    body.WithWeapon(new BaseWeapon(weapon ?? "unknown"));
+    body.WithWeapon(new BaseWeapon(ev.Weapon));
 
     var bodyCreatedEvent = new BodyCreateEvent(body);
     bus.Dispatch(bodyCreatedEvent);
 
     if (bodyCreatedEvent.IsCanceled) ragdollBody.AcceptInput("Kill");
+    return HookResult.Continue;
   }
 
   [UsedImplicitly]

TTT/CS2/GameHandlers/BuyMenuHandler.cs

@@ -29,9 +29,9 @@ public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
     { "weapon_usp_silencer", "M4A1" },
     { "weapon_sg556", "M4A1" },
     { "weapon_mp5sd", "M4A1" },
-    { "weapon_decoy", "healthshot" },
     { "weapon_awp", "AWP" },
-    { "weapon_hegrenade", "Cluster" }
+    { "weapon_hegrenade", "Cluster" },
+    { "weapon_decoy", "Teleport Decoy" }
   };
 
   public void Dispose() { }
@@ -49,6 +49,14 @@ public class BuyMenuHandler(IServiceProvider provider) : IPluginModule {
     }
 
     inventory.RemoveWeapon(player, new BaseWeapon(ev.Weapon));
+    switch (ev.Weapon) {
+      case "weapon_m4a1_silencer":
+        inventory.RemoveWeaponInSlot(player, 0);
+        break;
+      case "weapon_revolver":
+        inventory.RemoveWeaponInSlot(player, 1);
+        break;
+    }
 
     if (!shopAliases.TryGetValue(ev.Weapon, out var alias))
       return HookResult.Continue;

TTT/CS2/GameHandlers/CombatHandler.cs

@@ -7,8 +7,10 @@ using TTT.API;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
+using TTT.API.Role;
 using TTT.CS2.API;
 using TTT.Game.Events.Player;
+using TTT.Game.Roles;
 
 namespace TTT.CS2.GameHandlers;
 
@@ -21,6 +23,9 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
+  private readonly IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
   private readonly IAliveSpoofer spoofer =
     provider.GetRequiredService<IAliveSpoofer>();
 
@@ -45,12 +50,36 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
     if (games.ActiveGame is not { State: State.IN_PROGRESS })
       return HookResult.Continue;
 
+    if (ev.Attacker != null) {
+      ev.FireEventToClient(ev.Attacker);
+      var apiPlayer = converter.GetPlayer(ev.Attacker);
+      var role      = roles.GetRoles(apiPlayer);
+      if (role.Any(r => r is TraitorRole))
+        foreach (var p in Utilities.GetPlayers()) {
+          var apiP = converter.GetPlayer(p);
+          if (apiP.Id == apiPlayer.Id) continue;
+          var r = roles.GetRoles(converter.GetPlayer(p));
+          if (role.Intersect(r).Any()) ev.FireEventToClient(p);
+        }
+    }
+
     info.DontBroadcast = true;
     spoofer.SpoofAlive(player);
     Server.NextWorldUpdateAsync(() => bus.Dispatch(deathEvent));
     return HookResult.Continue;
   }
 
+  [UsedImplicitly]
+  [GameEventHandler(HookMode.Pre)]
+  public HookResult OnPlayerDamage(EventPlayerHurt ev, GameEventInfo info) {
+    var player = ev.Userid;
+    if (player == null) return HookResult.Continue;
+
+    hideAndTrackStats(ev);
+
+    return HookResult.Continue;
+  }
+
   private void hideAndTrackStats(EventPlayerDeath ev,
     CCSPlayerController player) {
     var victimStats = player.ActionTrackingServices?.MatchStats;
@@ -67,13 +96,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;
@@ -85,6 +117,16 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
         "m_pActionTrackingServices");
   }
 
+  private void hideAndTrackStats(EventPlayerHurt ev) {
+    var attackerStats = ev.Attacker?.ActionTrackingServices?.MatchStats;
+
+    if (attackerStats == null) return;
+    if (ev.Attacker == null) return;
+    attackerStats.Damage -= ev.DmgHealth;
+    Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
+      "m_pActionTrackingServices");
+  }
+
   [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnPlayerHurt(EventPlayerHurt ev, GameEventInfo _) {

TTT/CS2/GameHandlers/DamageCanceler.cs

@@ -30,6 +30,10 @@ 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);

TTT/CS2/GameHandlers/DamageCancelers/TaserListenCanceler.cs

@@ -1,5 +1,7 @@
-using TTT.API.Events;
+using JetBrains.Annotations;
+using TTT.API.Events;
 using TTT.API.Game;
+using TTT.CS2.Actions;
 using TTT.CS2.lang;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
@@ -8,6 +10,7 @@ namespace TTT.CS2.GameHandlers.DamageCancelers;
 
 public class TaserListenCanceler(IServiceProvider provider)
   : BaseListener(provider) {
+  [UsedImplicitly]
   [EventHandler]
   public void OnHurt(PlayerDamagedEvent ev) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
@@ -23,5 +26,6 @@ public class TaserListenCanceler(IServiceProvider provider)
 
     Messenger.Message(attacker,
       Locale[CS2Msgs.TASER_SCANNED(victim, Roles.GetRoles(victim).First())]);
+    Games.ActiveGame.Logger.LogAction(new TaserAction(Roles, victim, attacker));
   }
 }

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();
+    });
+  }
 }

TTT/CS2/GameHandlers/MapChangeCausesEndListener.cs

@@ -0,0 +1,26 @@
+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) {
+    if (games.ActiveGame is not { State: State.IN_PROGRESS or State.COUNTDOWN })
+      return;
+    games.ActiveGame?.EndGame(new EndReason("Map Change"));
+  }
+}

TTT/CS2/GameHandlers/NameUpdater.cs

@@ -0,0 +1,22 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Events;
+using TTT.API.Player;
+using TTT.Game.Events.Game;
+using TTT.Game.Listeners;
+
+namespace TTT.CS2.GameHandlers;
+
+public class NameUpdater(IServiceProvider provider) : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameInit(GameInitEvent ev) {
+    foreach (var player in Utilities.GetPlayers())
+      converter.GetPlayer(player).Name = player.PlayerName;
+  }
+}

TTT/CS2/GameHandlers/PlayerMuter.cs

@@ -4,9 +4,12 @@ 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;
@@ -15,6 +18,9 @@ public class PlayerMuter(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>();
 
@@ -36,6 +42,8 @@ public class PlayerMuter(IServiceProvider provider) : IPluginModule {
 
     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]);
@@ -52,4 +60,12 @@ public class PlayerMuter(IServiceProvider provider) : IPluginModule {
     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;
+  }
 }

TTT/CS2/GameHandlers/PropMover.cs

@@ -51,7 +51,9 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
       return;
     }
 
-    if (!pressed.HasFlag(PlayerButtons.Use)) return;
+    if (!pressed.HasFlag(PlayerButtons.Use)
+      && !pressed.HasFlag(PlayerButtons.Inspect))
+      return;
 
     onStartUse(player);
   }
@@ -90,9 +92,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() {

TTT/CS2/GameHandlers/RoleIconsHandler.cs

@@ -6,7 +6,6 @@ using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Events;
-using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.CS2.Extensions;
@@ -75,6 +74,12 @@ public class RoleIconsHandler(IServiceProvider provider)
     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);
   }
@@ -98,8 +103,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();

TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs

@@ -12,16 +12,18 @@ 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 readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
+  private TTTConfig config
+    => provider.GetService<IStorage<TTTConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
   public void Dispose() { }
 
   public void Start() { }

TTT/CS2/GameHandlers/TeamChangeHandler.cs

@@ -9,11 +9,16 @@ 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.Events.Player;
 
 namespace TTT.CS2.GameHandlers;
 
 public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
@@ -33,6 +38,8 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
     CommandInfo commandInfo) {
     CsTeam requestedTeam;
 
+    if (player == null) return HookResult.Continue;
+
     if (int.TryParse(commandInfo.GetArg(1), out var teamIndex))
       requestedTeam = (CsTeam)teamIndex;
     else
@@ -44,15 +51,21 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
       };
 
     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 (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;
   }
 

TTT/CS2/GameHandlers/TraitorChatHandler.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
+using CounterStrikeSharp.API.Modules.Utils;
 using MAULActainShared.plugin;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
@@ -7,6 +8,7 @@ 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;
@@ -27,6 +29,8 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
   private readonly IMessenger messenger =
     provider.GetRequiredService<IMessenger>();
 
+  private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
+
   private readonly IRoleAssigner roles =
     provider.GetRequiredService<IRoleAssigner>();
 
@@ -36,37 +40,57 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
     try {
       maulService ??= EgoApi.MAUL.Get();
       if (maulService != null) {
-        maulService.getChatShareService().OnChatShare += OnOnChatShare;
+        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 -= OnOnChatShare;
+      maulService.getChatShareService().OnChatShare -= OnChatShare;
   }
 
   public void Start() { }
 
-  private void OnOnChatShare(CCSPlayerController? player, CommandInfo info,
+  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;
-    var result                                 = onSay(player, info);
-    if (result == HookResult.Handled) canceled = true;
+    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 && player != null && player.GetHealth() > 0
+      && 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))
+      || !roles.GetRoles(apiPlayer).Any(r => r is TraitorRole)
+      || player.GetHealth() <= 0)
       return HookResult.Continue;
 
     var teammates = game.ActiveGame?.Players.Where(p

TTT/CS2/Items/Armor/ArmorItem.cs

@@ -16,15 +16,15 @@ 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 readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private ArmorConfig config
+    => Provider.GetService<IStorage<ArmorConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ArmorConfig();
+
   public override string Name => Locale[ArmorMsgs.SHOP_ITEM_ARMOR];
   public override string Description => Locale[ArmorMsgs.SHOP_ITEM_ARMOR_DESC];
   public override ShopItemConfig Config => config;

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];
 

TTT/CS2/Items/BodyPaint/BodyPaintListener.cs

@@ -17,16 +17,16 @@ public class BodyPaintListener(IServiceProvider provider)
   private readonly IBodyTracker bodies =
     provider.GetRequiredService<IBodyTracker>();
 
-  private readonly BodyPaintConfig config =
-    provider.GetService<IStorage<BodyPaintConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new BodyPaintConfig();
-
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
   private readonly Dictionary<IPlayer, int> uses = new();
 
+  private BodyPaintConfig config
+    => Provider.GetService<IStorage<BodyPaintConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new BodyPaintConfig();
+
   [UsedImplicitly]
   [EventHandler(Priority = Priority.HIGH)]
   public void BodyIdentify(BodyIdentifyEvent ev) {

TTT/CS2/Items/Camouflage/CamouflageItem.cs

@@ -18,13 +18,15 @@ 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 readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private CamoConfig config
+    => Provider.GetService<IStorage<CamoConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new CamoConfig();
+
   public override string Name => Locale[CamoMsgs.SHOP_ITEM_CAMO];
   public override string Description => Locale[CamoMsgs.SHOP_ITEM_CAMO_DESC];
   public override ShopItemConfig Config => config;

TTT/CS2/Items/ClusterGrenade/ClusterGrenadeItem.cs

@@ -18,11 +18,11 @@ public static class ClusterGrenadeServiceCollection {
 
 public class ClusterGrenadeItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider) {
-  private readonly ClusterGrenadeConfig config = provider
-   .GetService<IStorage<ClusterGrenadeConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new ClusterGrenadeConfig();
+  private ClusterGrenadeConfig config
+    => Provider.GetService<IStorage<ClusterGrenadeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ClusterGrenadeConfig();
 
   public override string Name
     => Locale[ClusterGrenadeMsgs.SHOP_ITEM_CLUSTER_GRENADE];

TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs

@@ -1,9 +1,6 @@
-using System.Reactive.Concurrency;
-using CounterStrikeSharp.API;
+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;
@@ -11,23 +8,26 @@ 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 readonly 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>();
 
+  private ClusterGrenadeConfig config
+    => provider.GetService<IStorage<ClusterGrenadeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new ClusterGrenadeConfig();
+
+  public void Dispose() { }
+  public void Start() { }
+
   [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnHeGrenade(EventHegrenadeDetonate ev, GameEventInfo _) {
@@ -59,7 +59,4 @@ public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
 
     return HookResult.Continue;
   }
-
-  public void Dispose() { }
-  public void Start() { }
 }

TTT/CS2/Items/Compass/AbstractCompassItem.cs

@@ -1,5 +1,3 @@
-using System.Linq;
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Timers;
 using CounterStrikeSharp.API.Modules.Utils;
@@ -10,7 +8,6 @@ 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;
@@ -18,22 +15,20 @@ 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.
+///   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 readonly CompassConfig config;
   protected readonly IPlayerConverter<CCSPlayerController> Converter;
   protected readonly ISet<IPlayer> Owners = new HashSet<IPlayer>();
 
   protected AbstractCompassItem(IServiceProvider provider) : base(provider) {
-    config = provider.GetService<IStorage<CompassConfig>>()
+    _Config = provider.GetService<IStorage<CompassConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new CompassConfig();
@@ -42,7 +37,9 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
       provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
   }
 
-  public override ShopItemConfig Config => config;
+  protected CompassConfig _Config { get; }
+
+  public override ShopItemConfig Config => _Config;
 
   public void Start(BasePlugin? plugin) {
     base.Start();
@@ -56,14 +53,14 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
   }
 
   /// <summary>
-  /// Return world positions to point at for this player.
+  ///   Return world positions to point at for this player.
   /// </summary>
-  protected abstract IList<Vector> GetTargets(IOnlinePlayer requester);
+  abstract protected IList<Vector> GetTargets(IOnlinePlayer requester);
 
   /// <summary>
-  /// Whether this player currently owns/has this compass effect.
+  ///   Whether this player currently owns/has this compass effect.
   /// </summary>
-  protected abstract bool OwnsItem(IOnlinePlayer player);
+  abstract protected bool OwnsItem(IOnlinePlayer player);
 
   public override void OnPurchase(IOnlinePlayer player) { Owners.Add(player); }
 
@@ -80,6 +77,7 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
     foreach (var player in Owners.OfType<IOnlinePlayer>()) {
       var gamePlayer = Converter.GetPlayer(player);
       if (gamePlayer == null) continue;
+      if (!player.IsAlive) continue;
       ShowCompass(gamePlayer, player);
     }
   }
@@ -95,7 +93,7 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
     if (targets.Count == 0) return;
 
     var (nearest, distance) = GetNearestVector(src, targets);
-    if (nearest == null || distance > config.MaxRange) return;
+    if (nearest == null || distance > _Config.MaxRange) return;
 
     var normalizedYaw = AdjustGameAngle(viewer.PlayerPawn.Value.EyeAngles.Y);
 
@@ -120,8 +118,8 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
   }
 
   private string GenerateCompass(float pointing, float target) {
-    return TextCompass.GenerateCompass(config.CompassFOV, config.CompassLength,
-      pointing, targetDir: target);
+    return TextCompass.GenerateCompass(_Config.CompassFOV,
+      _Config.CompassLength, pointing, targetDir: target);
   }
 
   private static string GetDistanceDescription(float distance) {

TTT/CS2/Items/Compass/BodyCompassItem.cs

@@ -27,11 +27,11 @@ public class BodyCompassItem(IServiceProvider provider)
     => 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.
+  ///   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) {
+  override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
       return Array.Empty<Vector>();
 

TTT/CS2/Items/Compass/InnoCompassItem.cs

@@ -23,11 +23,11 @@ public class InnoCompassItem(IServiceProvider provider)
     => 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.
+  ///   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) {
+  override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
       return Array.Empty<Vector>();
 

TTT/CS2/Items/DNA/DnaListener.cs

@@ -28,15 +28,15 @@ 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 readonly Dictionary<string, DateTime> lastMessages = new();
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
+  private DnaScannerConfig config
+    => Provider.GetService<IStorage<DnaScannerConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new DnaScannerConfig();
+
   // Low priority to allow body identification to happen first
   [UsedImplicitly]
   [EventHandler(Priority = Priority.LOW)]

TTT/CS2/Items/DNA/DnaMsgs.cs

@@ -1,6 +1,6 @@
 using TTT.API.Player;
 using TTT.API.Role;
-using TTT.Game;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.CS2.Items.DNA;

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];

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];

TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs

@@ -4,7 +4,6 @@ using ShopAPI;
 using ShopAPI.Configs.Traitor;
 using TTT.API.Events;
 using TTT.API.Game;
-using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
@@ -13,14 +12,14 @@ namespace TTT.CS2.Items.OneHitKnife;
 
 public class OneHitKnifeListener(IServiceProvider provider)
   : BaseListener(provider) {
-  private readonly OneHitKnifeConfig config =
-    provider.GetService<IStorage<OneHitKnifeConfig>>()
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  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 +31,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;
   }
 }

TTT/CS2/Items/PoisonShots/PoisonShotsItem.cs

@@ -10,7 +10,7 @@ using TTT.Game.Roles;
 namespace TTT.CS2.Items.PoisonShots;
 
 public static class PoisonShotServiceCollection {
-  public static void AddPoisonShots(this IServiceCollection services) {
+  public static void AddPoisonShotsServices(this IServiceCollection services) {
     services.AddModBehavior<PoisonShotsItem>();
     services.AddModBehavior<PoisonShotsListener>();
   }
@@ -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];
 

TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs

@@ -3,16 +3,21 @@ using System.Reactive.Concurrency;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Modules.UserMessages;
+using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using ShopAPI.Configs.Traitor;
+using SpecialRoundAPI;
 using TTT.API;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
+using TTT.Game.Events.Body;
 using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
@@ -23,15 +28,11 @@ public class PoisonShotsListener(IServiceProvider provider)
   : BaseListener(provider), IPluginModule {
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
-  private readonly PoisonShotsConfig config =
-    provider.GetService<IStorage<PoisonShotsConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new PoisonShotsConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
+
   private readonly Dictionary<IPlayer, int> poisonShots = new();
 
   private readonly List<IDisposable> poisonTimers = [];
@@ -41,16 +42,27 @@ public class PoisonShotsListener(IServiceProvider provider)
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
+  private PoisonShotsConfig config
+    => Provider.GetService<IStorage<PoisonShotsConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonShotsConfig();
+
   public override void Dispose() {
     base.Dispose();
     foreach (var timer in poisonTimers) timer.Dispose();
   }
 
+  public void Start(BasePlugin? plugin) {
+    base.Start();
+    plugin?.HookUserMessage(452, onWeaponSound);
+  }
+
   [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnFire(EventWeaponFire ev, GameEventInfo _) {
     if (ev.Userid == null) return HookResult.Continue;
-    if (!Tag.GUNS.Contains(ev.Weapon)) return HookResult.Continue;
+    if (!Tag.PISTOLS.Contains(ev.Weapon)) return HookResult.Continue;
     if (converter.GetPlayer(ev.Userid) is not IOnlinePlayer player)
       return HookResult.Continue;
     var remainingShots = usePoisonShot(player);
@@ -66,7 +78,7 @@ public class PoisonShotsListener(IServiceProvider provider)
     if (ev.Attacker == null) return;
     if (!poisonShots.TryGetValue(ev.Attacker, out var shot) || shot <= 0)
       return;
-    if (ev.Weapon == null || !Tag.GUNS.Contains(ev.Weapon)) return;
+    if (ev.Weapon == null || !Tag.PISTOLS.Contains(ev.Weapon)) return;
     Messenger.Message(ev.Attacker,
       Locale[PoisonShotMsgs.SHOP_ITEM_POISON_HIT(ev.Player)]);
     addPoisonEffect(ev.Player, ev.Attacker);
@@ -80,6 +92,7 @@ public class PoisonShotsListener(IServiceProvider provider)
     foreach (var timer in poisonTimers) timer.Dispose();
     poisonTimers.Clear();
     poisonShots.Clear();
+    killedWithPoison.Clear();
   }
 
   [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
@@ -114,19 +127,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;
   }
@@ -151,6 +165,58 @@ public class PoisonShotsListener(IServiceProvider provider)
     return 0;
   }
 
+  private HookResult onWeaponSound(UserMessage msg) {
+    var defIndex = msg.ReadUInt("item_def_index");
+
+    if (!WeaponSoundIndex.PISTOLS.Contains(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 (converter.GetPlayer(player) is not IOnlinePlayer apiPlayer)
+      return HookResult.Continue;
+
+    if (poisonShots.TryGetValue(apiPlayer, out var shots) && shots > 0) {
+      msg.Recipients.Clear();
+      return HookResult.Handled;
+    }
+
+    return HookResult.Continue;
+  }
+
+  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;
+  }
+
+  [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;
+  }
+
   private class PoisonEffect(IPlayer player, IPlayer shooter) {
     public IPlayer Player { get; } = player;
     public IPlayer Shooter { get; } = shooter;

TTT/CS2/Items/PoisonSmoke/PoisonSmokeItem.cs

@@ -10,7 +10,7 @@ using TTT.Game.Roles;
 namespace TTT.CS2.Items.PoisonSmoke;
 
 public static class PoisonSmokeServiceCollection {
-  public static void AddPoisonSmoke(this IServiceCollection services) {
+  public static void AddPoisonSmokeServices(this IServiceCollection services) {
     services.AddModBehavior<PoisonSmokeItem>();
     services.AddModBehavior<PoisonSmokeListener>();
   }
@@ -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();

TTT/CS2/Items/PoisonSmoke/PoisonSmokeListener.cs

@@ -9,44 +9,44 @@ 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 readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+
+  private readonly List<IDisposable> poisonSmokes = [];
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  private PoisonSmokeConfig config
+    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new PoisonSmokeConfig();
 
-  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() {
+  public override void Dispose() {
+    base.Dispose();
     foreach (var timer in poisonSmokes) timer.Dispose();
 
     poisonSmokes.Clear();
+    killedWithPoison.Clear();
   }
 
-  public void Start() { }
 
   [UsedImplicitly]
   [GameEventHandler]
@@ -62,17 +62,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 +89,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) {
+  [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;
+  }
+
+  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;
   }
 }

TTT/CS2/Items/SilentAWP/SilentAWPItem.cs

@@ -24,18 +24,18 @@ public static class SilentAWPServiceCollection {
 
 public class SilentAWPItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
-  private readonly 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>();
 
+  private SilentAWPConfig config
+    => Provider.GetService<IStorage<SilentAWPConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new SilentAWPConfig();
+
   public override string Name => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP];
 
   public override string Description

TTT/CS2/Items/Station/DamageStation.cs

@@ -1,12 +1,16 @@
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
+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.Game.Events.Body;
+using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
 using TTT.Game.Roles;
 
@@ -23,17 +27,13 @@ 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>>();
-
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
-  private readonly IRoleAssigner roles =
-    provider.GetRequiredService<IRoleAssigner>();
+  private readonly Dictionary<string, StationInfo> killedWithStation = new();
 
   public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HURT];
 
@@ -43,22 +43,29 @@ public class DamageStation(IServiceProvider provider)
   override protected void onInterval() {
     var players  = finder.GetOnline();
     var toRemove = new List<CPhysicsPropMultiplayer>();
-    foreach (var (prop, info) in props) {
+    var playerMapping = players
+     .Select(p => (ApiPlayer: p, GamePlayer: Converter.GetPlayer(p)))
+     .Where(m
+        => m.GamePlayer != null
+        && !Roles.GetRoles(m.ApiPlayer).Any(r => r is TraitorRole))
+     .ToList();
+
+    // accumulate contributions per player: ApiPlayer -> list of (stationInfo, damage, gamePlayer)
+    var playerDamageMap =
+      new Dictionary<IOnlinePlayer, List<(StationInfo info, int damage,
+        CCSPlayerController gamePlayer)>>();
+
+    foreach (var (prop, info) in Props) {
       if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
-        > Math.Abs(_Config.TotalHealthGiven)) {
+        > Math.Abs(_Config.TotalHealthGiven) || !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)))
-       .Where(m => m.GamePlayer != null);
 
       var playerDists = playerMapping
-       .Where(t => !roles.GetRoles(t.ApiPlayer).OfType<TraitorRole>().Any())
        .Select(t => (t.ApiPlayer, Origin: t.GamePlayer!.Pawn.Value?.AbsOrigin,
           t.GamePlayer))
        .Where(t => t is { Origin: not null, ApiPlayer.IsAlive: true })
@@ -70,29 +77,91 @@ public class DamageStation(IServiceProvider provider)
       foreach (var (player, dist, gamePlayer) in playerDists) {
         var healthScale = 1.0 - dist / _Config.MaxRange;
         var damageAmount =
-          (int)Math.Floor(_Config.HealthIncrements * healthScale);
+          Math.Abs((int)Math.Floor(_Config.HealthIncrements * healthScale));
 
-        var dmgEvent = new PlayerDamagedEvent(player,
-          info.Owner as IOnlinePlayer, damageAmount) { Weapon = $"[{Name}]" };
+        if (damageAmount <= 0) continue;
 
-        bus.Dispatch(dmgEvent);
-
-        damageAmount = -dmgEvent.DmgDealt;
-
-        player.Health    += damageAmount;
-        info.HealthGiven += damageAmount;
-
-        if (player.Health + damageAmount <= 0) {
-          var playerDeath = new PlayerDeathEvent(player)
-           .WithKiller(info.Owner as IOnlinePlayer)
-           .WithWeapon($"[{Name}]");
-          bus.Dispatch(playerDeath);
+        if (!playerDamageMap.TryGetValue(player, out var list)) {
+          list                    = [];
+          playerDamageMap[player] = list;
         }
 
-        gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
+        list.Add((info, damageAmount, gamePlayer));
       }
     }
 
-    foreach (var prop in toRemove) props.Remove(prop);
+    // Apply accumulated damage per player once
+    applyDamage(playerDamageMap);
+
+    // remove invalid/expired props
+    foreach (var prop in toRemove) Props.Remove(prop);
+  }
+
+  private void applyDamage(
+    Dictionary<IOnlinePlayer, List<(StationInfo info, int damage,
+      CCSPlayerController gamePlayer)>> playerDamageMap) {
+    foreach (var kv in playerDamageMap) {
+      var player   = kv.Key;
+      var contribs = kv.Value;
+
+      var totalDamage = contribs.Sum(c => c.damage);
+
+      if (totalDamage <= 0) continue;
+
+      // choose the station that contributed the most damage to attribute the kill to
+      var dominantInfo = contribs.OrderByDescending(c => c.damage).First().info;
+      var gamePlayer   = contribs.First().gamePlayer;
+
+      // dispatch single PlayerDamagedEvent with total damage
+      var dmgEvent = new PlayerDamagedEvent(player,
+        dominantInfo.Owner as IOnlinePlayer, totalDamage) {
+        Weapon = $"[{Name}]"
+      };
+
+      bus.Dispatch(dmgEvent);
+
+      totalDamage = dmgEvent.DmgDealt;
+
+      // if this will kill the player, attribute death to the dominant station
+      if (player.Health - totalDamage <= 0) {
+        killedWithStation[player.Id] = dominantInfo;
+        var playerDeath = new PlayerDeathEvent(player)
+         .WithKiller(dominantInfo.Owner as IOnlinePlayer)
+         .WithWeapon($"[{Name}]");
+        bus.Dispatch(playerDeath);
+      }
+
+      gamePlayer.EmitSound("Player.DamageFall", SELF(gamePlayer.Slot), 0.2f);
+
+      // apply damage to player's health
+      player.Health -= totalDamage;
+
+      // update each station's HealthGiven by its own contribution
+      foreach (var (info, damage, _) in contribs) info.HealthGiven += damage;
+    }
+  }
+
+
+  private static RecipientFilter SELF(int slot) {
+    return new RecipientFilter(slot);
+  }
+
+  [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;
   }
 }

TTT/CS2/Items/Station/HealthStation.cs

@@ -10,7 +10,8 @@ using TTT.Game.Roles;
 namespace TTT.CS2.Items.Station;
 
 public static class HealthStationCollection {
-  public static void AddHealthStation(this IServiceCollection collection) {
+  public static void
+    AddHealthStationServices(this IServiceCollection collection) {
     collection.AddModBehavior<HealthStation>();
   }
 }
@@ -29,15 +30,41 @@ public class HealthStation(IServiceProvider provider)
   override protected void onInterval() {
     var players  = Utilities.GetPlayers();
     var toRemove = new List<CPhysicsPropMultiplayer>();
-    foreach (var (prop, info) in props) {
+
+    // build per-player potential heal contributions and gather props to remove
+    var perPlayerContrib = BuildPerPlayerContributions(players, toRemove);
+
+    // apply the accumulated heals in a single pass per player
+    applyAccumulatedHeals(perPlayerContrib);
+
+    // remove invalid/expired props
+    foreach (var prop in toRemove) Props.Remove(prop);
+  }
+
+  /// <summary>
+  ///   Scan all props and build a map: Player -> list of (StationInfo, potentialHeal).
+  ///   Also fills toRemove for invalid/expired props.
+  /// </summary>
+  private
+    Dictionary<CCSPlayerController, List<(StationInfo info, int potential)>>
+    BuildPerPlayerContributions(IReadOnlyList<CCSPlayerController> players,
+      List<CPhysicsPropMultiplayer> toRemove) {
+    var result =
+      new Dictionary<CCSPlayerController, List<(StationInfo, int)>>();
+
+    foreach (var (prop, info) in Props) {
       if (_Config.TotalHealthGiven != 0
         && Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
         toRemove.Add(prop);
         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))
@@ -47,18 +74,130 @@ public class HealthStation(IServiceProvider provider)
        .ToList();
 
       foreach (var (player, dist) in playerDists) {
-        var maxHp       = player.Pawn.Value?.MaxHealth ?? 100;
-        var healthScale = 1.0 - dist / _Config.MaxRange;
-        var healAmount =
-          (int)Math.Ceiling(_Config.HealthIncrements * healthScale);
-        var newHealth = Math.Min(player.GetHealth() + healAmount, maxHp);
-        player.SetHealth(newHealth);
-        info.HealthGiven += healAmount;
+        var potentialHeal = ComputePotentialHeal(dist);
+        if (potentialHeal <= 0) continue;
 
-        player.ExecuteClientCommand("play " + _Config.UseSound);
+        if (!result.TryGetValue(player, out var list)) {
+          list           = [];
+          result[player] = list;
+        }
+
+        list.Add((info, potentialHeal));
       }
     }
 
-    foreach (var prop in toRemove) props.Remove(prop);
+    return result;
+  }
+
+  /// <summary>
+  ///   Compute potential heal from a station given the distance.
+  ///   Mirrors your original logic: ceil(HealthIncrements * healthScale).
+  /// </summary>
+  private int ComputePotentialHeal(double dist) {
+    var healthScale = 1.0 - dist / _Config.MaxRange;
+    return (int)Math.Ceiling(_Config.HealthIncrements * healthScale);
+  }
+
+  /// <summary>
+  ///   Apply heals to each player once per tick.
+  ///   Distributes the actual heal proportionally across contributing stations,
+  ///   updates station.Info.HealthGiven and emits a single pickup sound if needed.
+  /// </summary>
+  private void applyAccumulatedHeals(
+    Dictionary<CCSPlayerController, List<(StationInfo info, int potential)>>
+      perPlayerContrib) {
+    foreach (var kv in perPlayerContrib) {
+      var player   = kv.Key;
+      var contribs = kv.Value;
+
+      var maxHp     = player.Pawn.Value?.MaxHealth ?? 100;
+      var currentHp = player.GetHealth();
+      if (currentHp >= maxHp) continue;
+
+      var totalPotential = contribs.Sum(c => c.potential);
+      if (totalPotential <= 0) continue;
+
+      var totalHealAvailable = Math.Min(totalPotential, maxHp - currentHp);
+      if (totalHealAvailable <= 0) continue;
+
+      var potentials = contribs.Select(c => c.potential).ToList();
+      var allocations =
+        allocateProportionalInteger(totalHealAvailable, potentials);
+
+      // safety clamp: never allocate more than a station's potential
+      for (var i = 0; i < allocations.Count; i++)
+        if (allocations[i] > potentials[i])
+          allocations[i] = potentials[i];
+
+      // if clamping reduced the total, try to redistribute remaining amount
+      var allocatedSum = allocations.Sum();
+      if (allocatedSum < totalHealAvailable) {
+        var remaining = totalHealAvailable - allocatedSum;
+        for (var i = 0; i < allocations.Count && remaining > 0; i++) {
+          var headroom = potentials[i] - allocations[i];
+          if (headroom <= 0) continue;
+          var give = Math.Min(headroom, remaining);
+          allocations[i] += give;
+          remaining      -= give;
+        }
+
+        allocatedSum = allocations.Sum();
+      }
+
+      // apply heal to player
+      var actualAllocated = Math.Min(allocatedSum, maxHp - currentHp);
+      if (actualAllocated <= 0) continue;
+
+      var newHealth = Math.Min(currentHp + actualAllocated, maxHp);
+      player.SetHealth(newHealth);
+
+      // update station HealthGiven
+      for (var i = 0; i < allocations.Count; i++) {
+        var info                            = contribs[i].info;
+        var allocated                       = allocations[i];
+        if (allocated > 0) info.HealthGiven += allocated;
+      }
+
+      // emit a single pickup sound if any heal applied
+      player.EmitSound("HealthShot.Pickup", null, 0.1f);
+    }
+  }
+
+  /// <summary>
+  ///   Proportionally distribute an integer total across integer potentials.
+  ///   Uses floor of shares and assigns leftover to largest fractional remainders.
+  ///   Returns a list of allocations with same length as potentials.
+  /// </summary>
+  private List<int>
+    allocateProportionalInteger(int total, List<int> potentials) {
+    var allocations    = new List<int>(new int[potentials.Count]);
+    var remainders     = new List<(int idx, double rem)>();
+    var sumBase        = 0;
+    var totalPotential = potentials.Sum();
+
+    if (totalPotential <= 0) return allocations;
+
+    for (var i = 0; i < potentials.Count; i++) {
+      var potential = potentials[i];
+      var share     = (double)potential / totalPotential * total;
+      var baseAlloc = (int)Math.Floor(share);
+      var rem       = share - baseAlloc;
+      allocations[i] =  baseAlloc;
+      sumBase        += baseAlloc;
+      remainders.Add((i, rem));
+    }
+
+    var leftover = total - sumBase;
+    if (leftover <= 0) return allocations;
+
+    remainders = remainders.OrderByDescending(r => r.rem).ToList();
+    var idx = 0;
+    while (leftover > 0 && idx < remainders.Count) {
+      allocations[remainders[idx].idx] += 1;
+      leftover--;
+      idx++;
+    }
+
+    return allocations;
   }
 }

TTT/CS2/Items/Station/StationItem.cs

@@ -23,9 +23,9 @@ public abstract class StationItem<T>(IServiceProvider provider,
   protected readonly IPlayerConverter<CCSPlayerController> Converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly long PROP_SIZE_SQUARED = 500;
+  private readonly long PROP_SIZE_SQUARED = 700;
 
-  protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
+  protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> Props =
     new();
 
   private readonly IScheduler scheduler =
@@ -60,7 +60,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
   public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
     var hitVec = new Vector(ev.X, ev.Y, ev.Z);
 
-    var nearest = props
+    var nearest = Props
      .Select(kv => (kv.Key, kv.Value,
         Distance: kv.Key.AbsOrigin!.DistanceSquared(hitVec)))
      .Where(t => t.Key is { IsValid: true, AbsOrigin: not null })
@@ -76,7 +76,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
 
     if (nearest.Value.Health <= 0) {
       nearest.Key.AcceptInput("Kill");
-      props.Remove(nearest.Key);
+      Props.Remove(nearest.Key);
       return HookResult.Continue;
     }
 
@@ -105,8 +105,8 @@ public abstract class StationItem<T>(IServiceProvider provider,
       "weapon_deagle"                              => 40,
       _ when Tag.PISTOLS.Contains(designerWeapon)  => 10,
       _ when Tag.SMGS.Contains(designerWeapon)     => 15,
-      _ when Tag.SHOTGUNS.Contains(designerWeapon) => 25,
-      _ when Tag.RIFLES.Contains(designerWeapon)   => 45,
+      _ when Tag.SHOTGUNS.Contains(designerWeapon) => 15,
+      _ when Tag.RIFLES.Contains(designerWeapon)   => 35,
       _                                            => 5
     };
   }
@@ -119,7 +119,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
 
       if (prop == null) return;
 
-      props[prop] = new StationInfo(prop, _Config.StationHealth, player);
+      Props[prop] = new StationInfo(prop, _Config.StationHealth, player);
 
       prop.SetModel("models/props/cs_office/microwave.vmdl");
       prop.DispatchSpawn();

TTT/CS2/Items/TeleportDecoy/TeleportDecoyItem.cs

@@ -0,0 +1,39 @@
+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.TeleportDecoy;
+
+public static class TeleportDecoyServiceCollection {
+  public static void AddTeleportDecoyServices(
+    this IServiceCollection collection) {
+    collection.AddModBehavior<TeleportDecoyItem>();
+    collection.AddModBehavior<TeleportDecoyListener>();
+  }
+}
+
+public class TeleportDecoyItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  public override string Name
+    => Locale[TeleportDecoyMsgs.SHOP_ITEM_TELEPORT_DECOY];
+
+  public override string Description
+    => Locale[TeleportDecoyMsgs.SHOP_ITEM_TELEPORT_DECOY_DESC];
+
+  private TeleportDecoyConfig config
+    => Provider.GetService<IStorage<TeleportDecoyConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TeleportDecoyConfig();
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Inventory.GiveWeapon(player, new BaseWeapon("weapon_decoy"));
+  }
+}

TTT/CS2/Items/TeleportDecoy/TeleportDecoyListener.cs

@@ -0,0 +1,36 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using TTT.API;
+using TTT.API.Player;
+
+namespace TTT.CS2.Items.TeleportDecoy;
+
+public class TeleportDecoyListener(IServiceProvider provider) : IPluginModule {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnDecoyDetonate(EventDecoyDetonate 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<TeleportDecoyItem>(player)) return HookResult.Continue;
+
+    shop.RemoveItem<TeleportDecoyItem>(player);
+
+    var vec = new Vector(ev.X, ev.Y, ev.Z + 16);
+    ev.Userid.Pawn.Value?.Teleport(vec);
+    return HookResult.Continue;
+  }
+}

TTT/CS2/Items/TeleportDecoy/TeleportDecoyMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.TeleportDecoy;
+
+public class TeleportDecoyMsgs {
+  public static IMsg SHOP_ITEM_TELEPORT_DECOY
+    => MsgFactory.Create(nameof(SHOP_ITEM_TELEPORT_DECOY));
+
+  public static IMsg SHOP_ITEM_TELEPORT_DECOY_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_TELEPORT_DECOY_DESC));
+}

TTT/CS2/Items/Tripwire/TripwireDamageListener.cs

@@ -0,0 +1,47 @@
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Storage;
+using TTT.CS2.API.Items;
+using TTT.CS2.Extensions;
+
+namespace TTT.CS2.Items.Tripwire;
+
+public class TripwireDamageListener(IServiceProvider provider) : IPluginModule {
+  private readonly ITripwireActivator? tripwireActivator =
+    provider.GetRequiredService<ITripwireActivator>();
+
+  private readonly ITripwireTracker? tripwires =
+    provider.GetService<ITripwireTracker>();
+
+  private TripwireConfig config
+    => provider.GetService<IStorage<TripwireConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TripwireConfig();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
+    if (tripwires == null) return HookResult.Continue;
+    var hitVec = new Vector(ev.X, ev.Y, ev.Z);
+
+    var nearest = tripwires.ActiveTripwires
+     .OrderBy(wire => wire.TripwireProp.AbsOrigin.DistanceSquared(hitVec))
+     .FirstOrDefault();
+
+    if (nearest == null) return HookResult.Continue;
+    var distSquared = nearest.TripwireProp.AbsOrigin.DistanceSquared(hitVec);
+    if (distSquared > config.TripwireSizeSquared) return HookResult.Continue;
+
+    tripwireActivator?.ActivateTripwire(nearest);
+    return HookResult.Continue;
+  }
+}

TTT/CS2/Items/Tripwire/TripwireDefuserListener.cs

@@ -0,0 +1,129 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Messages;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.API.Items;
+using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
+using TTT.CS2.RayTrace.Enum;
+using TTT.Locale;
+
+namespace TTT.CS2.Items.Tripwire;
+
+public class TripwireDefuserListener(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 ITripwireTracker? tripwireTracker =
+    provider.GetService<ITripwireTracker>();
+
+  private TripwireConfig config
+    => provider.GetService<IStorage<TripwireConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TripwireConfig();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    if (tripwireTracker == null) return;
+    plugin
+    ?.RegisterListener<
+        CounterStrikeSharp.API.Core.Listeners.OnPlayerButtonsChanged>(
+        onButtonsChanged);
+  }
+
+  private void onButtonsChanged(CCSPlayerController player,
+    PlayerButtons pressed, PlayerButtons released) {
+    if (tripwireTracker == null) return;
+    if ((pressed & PlayerButtons.Use) != PlayerButtons.Use) return;
+
+    var instance = getTargetTripwire(player);
+    if (instance == null) return;
+
+    startDefuseTimer(player, instance);
+  }
+
+  private TripwireInstance? getTargetTripwire(CCSPlayerController player) {
+    if (tripwireTracker == null) return null;
+    var raytrace =
+      player.GetGameTraceByEyePosition(TraceMask.MaskSolid, Contents.NoDraw,
+        player);
+
+    if (raytrace == null || tripwireTracker.ActiveTripwires.Count == 0)
+      return null;
+    var raytracePos = raytrace.Value.EndPos.toVector();
+
+    var closest =
+      tripwireTracker?.ActiveTripwires.MinBy(i
+        => i.StartPos.DistanceSquared(raytracePos));
+
+    if (closest == null || closest.StartPos.DistanceSquared(raytracePos)
+      > config.TripwireSizeSquared)
+      return null;
+
+    if (player.Pawn.Value?.AbsOrigin == null
+      || closest.StartPos.DistanceSquared(player.Pawn.Value.AbsOrigin)
+      > config.MaxPlacementDistanceSquared)
+      return null;
+
+    return closest;
+  }
+
+  private void startDefuseTimer(CCSPlayerController player,
+    TripwireInstance instance) {
+    tickDefuse(player, instance, DateTime.Now);
+  }
+
+  private void tickDefuse(CCSPlayerController player, TripwireInstance instance,
+    DateTime startTime) {
+    if (!player.IsValid) return;
+    var apiPlayer = converter.GetPlayer(player);
+
+    if ((player.Buttons & PlayerButtons.Use) != PlayerButtons.Use) {
+      messenger.Message(apiPlayer,
+        locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED]);
+      return;
+    }
+
+    var progress = (DateTime.Now - startTime) / config.DefuseTime;
+    var timeLeft = config.DefuseTime - config.DefuseTime * progress;
+
+    if (progress >= 1) {
+      instance.TripwireProp.EmitSound("c4.disarmfinish", null, 0.2f, 1.5f);
+      tripwireTracker?.RemoveTripwire(instance);
+      if (apiPlayer is IOnlinePlayer online)
+        provider.GetService<IShop>()
+        ?.AddBalance(online, config.DefuseReward, "Tripwire Defusal");
+      return;
+    }
+
+    var target = getTargetTripwire(player);
+    if (target != instance) {
+      messenger.Message(apiPlayer,
+        locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED]);
+      return;
+    }
+
+    player.PrintToCenter(
+      locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DEFUSING(progress, timeLeft)]);
+    var pitch = 1.5f - (float)progress;
+    player.EmitSound("c4.keypressquiet", pitch: pitch);
+    var ticksDelay = (int)Math.Round(64 * config.DefuseRate.TotalSeconds);
+    Server.RunOnTick(Server.TickCount + ticksDelay,
+      () => tickDefuse(player, instance, startTime));
+  }
+}

TTT/CS2/Items/Tripwire/TripwireItem.cs

@@ -0,0 +1,165 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+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.Storage;
+using TTT.CS2.API.Items;
+using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
+using TTT.CS2.RayTrace.Enum;
+using TTT.CS2.RayTrace.Struct;
+using TTT.Game.Events.Game;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Tripwire;
+
+public static class TripwireServiceCollection {
+  public static void AddTripwireServices(this IServiceCollection services) {
+    services.AddModBehavior<ITripwireTracker, TripwireItem>();
+    services.AddModBehavior<ITripwireActivator, TripwireMovementListener>();
+    services.AddModBehavior<TripwireDamageListener>();
+    services.AddModBehavior<TripwireDefuserListener>();
+  }
+}
+
+public class TripwireItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider), IPluginModule, ITripwireTracker {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IScheduler scheduler =
+    provider.GetRequiredService<IScheduler>();
+
+  private TripwireConfig config
+    => Provider.GetService<IStorage<TripwireConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TripwireConfig();
+
+  public override string Name => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE];
+
+  public override string Description
+    => Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public void Start(BasePlugin? plugin) {
+    Start();
+    plugin
+    ?.RegisterListener<
+        CounterStrikeSharp.API.Core.Listeners.OnServerPrecacheResources>(
+        onPrecache);
+  }
+
+  public List<TripwireInstance> ActiveTripwires { get; } = [];
+
+  public void RemoveTripwire(TripwireInstance instance) {
+    instance.Beam.Remove();
+    instance.TripwireProp.Remove();
+    ActiveTripwires.Remove(instance);
+  }
+
+  private void onPrecache(ResourceManifest manifest) {
+    manifest.AddResource(
+      "models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEvent(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+    ActiveTripwires.Clear();
+  }
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Server.NextWorldUpdate(() => {
+      if (!placeTripwire(player, out var originTrace, out var endTrace,
+        out var tripwire))
+        return;
+
+      scheduler.Schedule(config.TripwireInitiationTime,
+        () => {
+          Server.NextWorldUpdate(() => {
+            createTripwireBeam(player, tripwire,
+              originTrace.Value.EndPos.toVector(),
+              endTrace.Value.EndPos.toVector());
+          });
+        });
+    });
+  }
+
+  private bool placeTripwire(IOnlinePlayer player,
+    [NotNullWhen(true)] out CGameTrace? originTrace,
+    [NotNullWhen(true)] out CGameTrace? endTrace,
+    [NotNullWhen(true)] out CDynamicProp? tripwire) {
+    tripwire    = null;
+    originTrace = null;
+    endTrace    = null;
+    var gamePlayer = converter.GetPlayer(player);
+    var playerPawn = gamePlayer?.PlayerPawn.Value;
+    if (gamePlayer == null || playerPawn == null) return false;
+
+    originTrace = gamePlayer.GetGameTraceByEyePosition(TraceMask.MaskSolid,
+      Contents.NoDraw, gamePlayer);
+    var origin = gamePlayer.GetEyePosition();
+    if (origin == null || originTrace == null) return false;
+
+    if (origin.DistanceSquared(originTrace.Value.EndPos.toVector())
+      > config.MaxPlacementDistanceSquared) {
+      Shop.AddBalance(player, config.Price, "Refund");
+      Messenger.Message(player, Locale[TripwireMsgs.SHOP_ITEM_TRIPWIRE_TOOFAR]);
+      return false;
+    }
+
+    var angles = originTrace.Value.Normal.toVector().toAngle();
+
+    endTrace = TraceRay.TraceShape(originTrace.Value.EndPos.toVector(), angles,
+      TraceMask.MaskSolid, Contents.NoDraw, gamePlayer);
+
+    tripwire = Utilities.CreateEntityByName<CDynamicProp>("prop_dynamic");
+    if (tripwire == null) return false;
+
+    tripwire.SetModel(
+      "models/generic/conveyor_control_panel_01/conveyor_button_02.vmdl");
+    tripwire.DispatchSpawn();
+
+    tripwire.Teleport(originTrace.Value.EndPos.toVector(),
+      originTrace.Value.Normal.toVector().toAngle());
+    tripwire.EmitSound("Weapon_ELITE.Clipout");
+    return true;
+  }
+
+  private void createTripwireBeam(IOnlinePlayer owner, CDynamicProp prop,
+    Vector start, Vector end) {
+    prop.EmitSound("C4.ExplodeTriggerTrip");
+    var beam = createBeamEnt(start, end);
+    if (beam == null) return;
+
+    var instance = new TripwireInstance(owner, beam, prop, start, end);
+    ActiveTripwires.Add(instance);
+  }
+
+  private CEnvBeam? createBeamEnt(Vector start, Vector end) {
+    var beam = Utilities.CreateEntityByName<CEnvBeam>("env_beam");
+    if (beam == null) return null;
+    beam.RenderMode = RenderMode_t.kRenderTransAlpha;
+    beam.Width      = config.TripwireThickness;
+    beam.Render     = config.TripwireColor;
+    beam.EndPos.X   = end.X;
+    beam.EndPos.Y   = end.Y;
+    beam.EndPos.Z   = end.Z;
+    beam.Teleport(start);
+    return beam;
+  }
+}

TTT/CS2/Items/Tripwire/TripwireMovementListener.cs

@@ -0,0 +1,137 @@
+using System.Diagnostics.CodeAnalysis;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Timers;
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.API.Items;
+using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
+using TTT.CS2.RayTrace.Enum;
+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.Tripwire;
+
+public class TripwireMovementListener(IServiceProvider provider)
+  : BaseListener(provider), IPluginModule, ITripwireActivator {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly Dictionary<string, TripwireInstance> killedWithTripwire =
+    new();
+
+  private readonly ITripwireTracker? tripwireTracker =
+    provider.GetService<ITripwireTracker>();
+
+  private TripwireConfig config
+    => Provider.GetService<IStorage<TripwireConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TripwireConfig();
+
+  public void Start(BasePlugin? plugin) {
+    if (tripwireTracker == null) return;
+    plugin?.AddTimer(0.2f, checkTripwires, TimerFlags.REPEAT);
+  }
+
+  public void ActivateTripwire(TripwireInstance instance) {
+    tripwireTracker?.RemoveTripwire(instance);
+    instance.TripwireProp.EmitSound("Flashbang.ExplodeDistant");
+
+    foreach (var player in Finder.GetOnline()) {
+      if (!dealTripwireDamage(instance, player, out var gamePlayer)) continue;
+      gamePlayer.EmitSound("Player.BurnDamage");
+    }
+  }
+
+  private void checkTripwires() {
+    if (tripwireTracker == null) return;
+    foreach (var wire in new List<TripwireInstance>(tripwireTracker
+     .ActiveTripwires)) {
+      var ray = TraceRay.TraceShape(wire.StartPos, wire.EndPos, Contents.Player,
+        wire.TripwireProp.Handle);
+      if (!ray.DidHit() || !ray.HitPlayer(out var player)) continue;
+
+      if (!config.FriendlyFireTriggers && player != null) {
+        var apiPlayer = converter.GetPlayer(player);
+        var role      = Roles.GetRoles(apiPlayer);
+        if (role.Any(r => r is TraitorRole)) continue;
+      }
+
+      ActivateTripwire(wire);
+    }
+  }
+
+  private float getDamage(float distance) {
+    return config.ExplosionPower
+      * MathF.Pow(MathF.E, -distance * config.FalloffDelay);
+  }
+
+  private int getDamage(CCSPlayerController gamePlayer, IOnlinePlayer player,
+    Vector tripwire) {
+    var origin = gamePlayer.Pawn.Value?.AbsOrigin;
+    if (origin == null) return 0;
+    var distance = tripwire.Distance(origin);
+    var damage   = getDamage(distance);
+    if (Roles.GetRoles(player).Any(r => r is TraitorRole))
+      damage *= config.FriendlyFireMultiplier;
+
+    return (int)Math.Floor(damage);
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    killedWithTripwire.Clear();
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRagdollSpawn(BodyCreateEvent ev) {
+    if (!killedWithTripwire.TryGetValue(ev.Body.Id, out var info)) return;
+    if (ev.Body.Killer != null && ev.Body.Killer.Id != ev.Body.OfPlayer.Id)
+      return;
+    ev.Body.Killer = info.owner;
+  }
+
+  private bool dealTripwireDamage(TripwireInstance instance,
+    IOnlinePlayer player,
+    [NotNullWhen(true)] out CCSPlayerController? gamePlayer) {
+    gamePlayer = null;
+    if (!player.IsAlive) return false;
+
+    gamePlayer = converter.GetPlayer(player);
+    if (gamePlayer == null) return false;
+    var damage = getDamage(gamePlayer, player, instance.StartPos);
+
+    if (damage < 1) return false;
+
+    Event ev;
+    if (player.Health - damage <= 0) {
+      killedWithTripwire[player.Id] = instance;
+      ev = new PlayerDeathEvent(player).WithKiller(instance.owner)
+       .WithWeapon("[Tripwire]");
+    } else {
+      ev = new PlayerDamagedEvent(player, instance.owner, damage) {
+        Weapon = "[Tripwire]"
+      };
+    }
+
+    Bus.Dispatch(ev);
+
+    player.Health -= damage;
+    return true;
+  }
+}

TTT/CS2/Items/Tripwire/TripwireMsgs.cs

@@ -0,0 +1,23 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.Tripwire;
+
+public class TripwireMsgs {
+  public static IMsg SHOP_ITEM_TRIPWIRE
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE));
+
+  public static IMsg SHOP_ITEM_TRIPWIRE_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DESC));
+
+  public static IMsg SHOP_ITEM_TRIPWIRE_TOOFAR
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_TOOFAR));
+
+  public static IMsg SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED
+    => MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DEFUSING_CANCELED));
+
+  public static IMsg
+    SHOP_ITEM_TRIPWIRE_DEFUSING(double progress, TimeSpan time) {
+    return MsgFactory.Create(nameof(SHOP_ITEM_TRIPWIRE_DEFUSING),
+      progress.ToString("P0"), time.TotalSeconds.ToString("F1"));
+  }
+}

TTT/CS2/Listeners/AfkTimerListener.cs

@@ -0,0 +1,81 @@
+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.Game;
+using TTT.Game.Events.Game;
+using TTT.Game.Listeners;
+
+namespace TTT.CS2.Listeners;
+
+public class AfkTimerListener(IServiceProvider provider)
+  : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private IDisposable? specTimer, specWarnTimer;
+
+  private TTTConfig config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
+  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();
+  }
+}

TTT/CS2/Listeners/BodyPickupListener.cs

@@ -8,8 +8,8 @@ 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;
 using TTT.Game.Roles;
 
@@ -34,6 +34,8 @@ public class BodyPickupListener(IServiceProvider provider)
     if (ev.Player is not IOnlinePlayer online)
       throw new InvalidOperationException("Player is not an online player.");
 
+    if (ev.Player.Id == body.OfPlayer.Id) return;
+
     var identifyEvent = new BodyIdentifyEvent(body, online);
 
     Bus.Dispatch(identifyEvent);
@@ -57,7 +59,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);
 

TTT/CS2/Listeners/KarmaBanner.cs

@@ -15,12 +15,6 @@ using TTT.Karma.lang;
 namespace TTT.CS2.Listeners;
 
 public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
-  private readonly KarmaConfig config =
-    provider.GetService<IStorage<KarmaConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new KarmaConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
@@ -31,6 +25,12 @@ public class KarmaBanner(IServiceProvider provider) : BaseListener(provider) {
 
   private readonly Dictionary<IPlayer, DateTime> lastWarned = new();
 
+  private KarmaConfig config
+    => Provider.GetService<IStorage<KarmaConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new KarmaConfig();
+
   [UsedImplicitly]
   [EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
   public void OnKarmaUpdate(KarmaUpdateEvent ev) {

TTT/CS2/Listeners/MapHookListener.cs

@@ -0,0 +1,48 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Events;
+using TTT.API.Player;
+using TTT.Game.Events.Game;
+using TTT.Game.Events.Player;
+using TTT.Game.Listeners;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Listeners;
+
+public class MapHookListener(IServiceProvider provider)
+  : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  [UsedImplicitly]
+  [EventHandler(Priority = Priority.MONITOR, IgnoreCanceled = true)]
+  public void OnRoleAssign(PlayerRoleAssignEvent ev) {
+    var player = converter.GetPlayer(ev.Player);
+    if (player == null) return;
+
+    switch (ev.Role) {
+      case TraitorRole:
+        player.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
+        break;
+      case DetectiveRole:
+        player.Pawn.Value?.AcceptInput("AddContext", null, null, "DETECTIVE:1");
+        break;
+      case InnocentRole:
+        player.Pawn.Value?.AcceptInput("AddContext", null, null, "INNOCENT:1");
+        break;
+    }
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRoundEnd(GameInitEvent ev) {
+    foreach (var player in Utilities.GetPlayers()) {
+      if (player.Pawn.Value == null) continue;
+      player.Pawn.Value.AcceptInput("RemoveContext", null, null, "TRAITOR");
+      player.Pawn.Value.AcceptInput("RemoveContext", null, null, "DETECTIVE");
+      player.Pawn.Value.AcceptInput("RemoveContext", null, null, "INNOCENT");
+    }
+  }
+}

TTT/CS2/Listeners/PlayerStatsTracker.cs

@@ -20,8 +20,8 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
 
   private readonly ISet<int> revealedDeaths = new HashSet<int>();
 
-  private readonly IDictionary<int, (int, int)> roundKillsAndAssists =
-    new Dictionary<int, (int, int)>();
+  private readonly IDictionary<int, RoundData> roundStats =
+    new Dictionary<int, RoundData>();
 
   public void Dispose() { }
 
@@ -50,24 +50,39 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
       ev.Assister == null ? null : converter.GetPlayer(ev.Assister);
 
     if (killer != null) {
-      roundKillsAndAssists.TryGetValue(killer.Slot, out var def);
-      def.Item1++;
-      roundKillsAndAssists[killer.Slot] = def;
+      roundStats.TryGetValue(killer.Slot, out var def);
+      def ??= new RoundData();
+      def.Kills++;
+      roundStats[killer.Slot] = def;
     }
 
     if (assister != null && assister != killer) {
-      roundKillsAndAssists.TryGetValue(assister.Slot, out var def);
-      def.Item2++;
-      roundKillsAndAssists[assister.Slot] = def;
+      roundStats.TryGetValue(assister.Slot, out var def);
+      def ??= new RoundData();
+      def.Assists++;
+      roundStats[assister.Slot] = def;
     }
   }
 
+  [UsedImplicitly]
+  [EventHandler(Priority = Priority.HIGH)]
+  public void OnDamage(PlayerDamagedEvent ev) {
+    var attacker =
+      ev.Attacker == null ? null : converter.GetPlayer(ev.Attacker);
+    if (attacker == null) return;
+
+    roundStats.TryGetValue(attacker.Slot, out var def);
+    def                       ??= new RoundData();
+    def.Damage                +=  ev.DmgDealt;
+    roundStats[attacker.Slot] =   def;
+  }
+
   [UsedImplicitly]
   [EventHandler]
   public void OnRoundEnd(GameStateUpdateEvent ev) {
     if (ev.NewState == State.IN_PROGRESS) {
       revealedDeaths.Clear();
-      roundKillsAndAssists.Clear();
+      roundStats.Clear();
       return;
     }
 
@@ -100,17 +115,24 @@ public class PlayerStatsTracker(IServiceProvider provider) : IListener {
     var online = finder.GetOnline()
      .Select(p => converter.GetPlayer(p))
      .OfType<CCSPlayerController>()
-     .Where(p => p.IsValid && roundKillsAndAssists.ContainsKey(p.Slot));
+     .Where(p => p.IsValid && roundStats.ContainsKey(p.Slot));
 
     foreach (var player in online) {
       var stats = player.ActionTrackingServices?.MatchStats;
       if (stats == null) continue;
 
-      var (kills, assists) =  roundKillsAndAssists[player.Slot];
-      stats.Kills          += kills;
-      stats.Assists        += assists;
+      if (!roundStats.TryGetValue(player.Slot, out var data)) continue;
+
+      stats.Kills   += data.Kills;
+      stats.Assists += data.Assists;
       Utilities.SetStateChanged(player, "CCSPlayerController",
         "m_pActionTrackingServices");
     }
   }
+
+  private record RoundData {
+    public int Assists;
+    public int Damage;
+    public int Kills;
+  }
 }

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 readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly IScheduler scheduler = provider
-   .GetRequiredService<IScheduler>();
+  public IDisposable? EndTimer;
 
-  private IDisposable? endTimer;
+  private TTTConfig config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
 
   [UsedImplicitly]
   [EventHandler(IgnoreCanceled = true)]
@@ -45,7 +42,7 @@ 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 && p is {
+         .Where(p => p.GetHealth() <= 0 && p is {
             Team: CsTeam.CounterTerrorist or CsTeam.Terrorist
           }))
           player.Respawn();
@@ -60,20 +57,20 @@ public class RoundTimerListener(IServiceProvider provider)
     if (ev.NewState == State.IN_PROGRESS)
       Server.NextWorldUpdate(() => {
         foreach (var player in Utilities.GetPlayers()
-         .Where(p => p.LifeState != (int)LifeState_t.LIFE_ALIVE && p is {
+         .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.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))));
@@ -130,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);
     }
 
@@ -139,6 +137,6 @@ public class RoundTimerListener(IServiceProvider provider)
   public override void Dispose() {
     base.Dispose();
 
-    endTimer?.Dispose();
+    EndTimer?.Dispose();
   }
 }

TTT/CS2/Listeners/WardenTagAssigner.cs

@@ -0,0 +1,66 @@
+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.ThirdParties.eGO;
+using TTT.Game.Events.Game;
+using TTT.Game.Events.Player;
+using TTT.Game.Listeners;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Listeners;
+
+public class WardenTagAssigner(IServiceProvider provider)
+  : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly Dictionary<string, (string, char)> oldTags = new();
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnRoleAssign(PlayerRoleAssignEvent ev) {
+    var maul = EgoApi.MAUL.Get();
+    if (maul == null) return;
+    if (ev.Role is not DetectiveRole) return;
+    var gamePlayer = converter.GetPlayer(ev.Player);
+    if (gamePlayer == null) return;
+
+    Task.Run(async () => {
+      var oldTag = await maul.getTagService().GetTag(gamePlayer.SteamID);
+      var oldTagColor =
+        await maul.getTagService().GetTagColor(gamePlayer.SteamID);
+      if (oldTag != "[DETECTIVE]")
+        oldTags[ev.Player.Id] = (oldTag, oldTagColor);
+
+      await Server.NextWorldUpdateAsync(() => {
+        maul.getTagService().SetTag(gamePlayer, "[DETECTIVE]", false);
+        maul.getTagService()
+         .SetTagColor(gamePlayer, ChatColors.DarkBlue, false);
+      });
+    });
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+    var maul = EgoApi.MAUL.Get();
+    if (maul == null) return;
+
+    foreach (var (playerId, (oldTag, oldTagColor)) in oldTags) {
+      var apiPlayer = Finder.GetPlayerById(playerId);
+      if (apiPlayer == null) continue;
+      var csPlayer = converter.GetPlayer(apiPlayer);
+      if (csPlayer == null || !csPlayer.IsValid) continue;
+      maul.getTagService().SetTag(csPlayer, oldTag, false);
+      maul.getTagService().SetTagColor(csPlayer, oldTagColor, false);
+    }
+
+    oldTags.Clear();
+  }
+}

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;
 
@@ -7,6 +9,7 @@ namespace TTT.CS2.Player;
 
 public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
   private readonly HashSet<CCSPlayerController> _fakeAlivePlayers = new();
+  private BasePlugin? plugin;
   public ISet<CCSPlayerController> FakeAlivePlayers => _fakeAlivePlayers;
 
   public void SpoofAlive(CCSPlayerController player) {
@@ -44,12 +47,31 @@ public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
     FakeAlivePlayers.Remove(player);
   }
 
-  public void Dispose() { }
+  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() {