Remerge main

```
- Add new configuration for poison shots in `Traitor/PoisonShotsConfig.cs` to manage properties like price, damage, and total shots.
- Implement `PoisonShotsListener` in the game to handle item usage, apply poison effects, and ensure resource management.
- Create `PoisonShotsItem` class to introduce a new item restricted to the Traitor role, integrating it with shop functionalities.
- Update `lang/en.yml` to include a new shop item description for "Poison Shots".
- Define message constants for poison shots in `PoisonShotMsgs.cs` to facilitate localization and UI display.
```

.github/workflows/release.yml

@@ -12,10 +12,18 @@ permissions:
 jobs:
   auto-release:
     runs-on: ubuntu-latest
+    env:
+      # Tweak these if you want a different model or style
+      OPENAI_MODEL: gpt-4o-mini
+      OPENAI_TEMPERATURE: "0.2"
+      # Safety: cap how many characters we feed to the model
+      MAX_CHANGELOG_CHARS: "50000"
+
     steps:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
+          fetch-tags: true
 
       # 1. Calculate version using GitVersion
       - name: Install GitVersion
@@ -48,7 +56,7 @@ jobs:
         run: |
           cd build/TTT
           zip -r TTT-${{ steps.gitversion.outputs.fullSemVer }}.zip *
-      
+
       # 2. Get latest tag
       - name: Get latest tag
         id: latest_tag
@@ -68,27 +76,131 @@ jobs:
           git tag ${{ steps.gitversion.outputs.fullSemVer }}
           git push origin ${{ steps.gitversion.outputs.fullSemVer }}
 
-      # 4. Determine previous tag for changelog
+      # 4. Determine previous relevant tag (lineage-aware)
       - name: Determine previous relevant tag
         id: prev_tag
         run: |
+          set -euo pipefail
           branch="${GITHUB_REF_NAME}"
-          if [[ "$branch" == "main" ]]; then
-            prev=$(git tag --sort=-creatordate | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sed -n 2p)
-          else
-            prev=$(git tag --sort=-creatordate | grep -E '^[0-9]+\.[0-9]+\.[0-9]+-' | sed -n 2p)
-          fi
-          echo "tag=${prev:-0.0.0}" >> $GITHUB_OUTPUT
 
-      # 5. Generate changelog
+          # Use HEAD^ to skip the tag we just created. If no parent, fall back to HEAD.
+          if git rev-parse --verify -q HEAD^ >/dev/null; then
+            base_rev="HEAD^"
+          else
+            base_rev="HEAD"
+          fi
+
+          # Match stable tags on main and prerelease tags on non-main
+          if [[ "$branch" == "main" ]]; then
+            pattern='[0-9]*.[0-9]*.[0-9]*'
+          else
+            pattern='[0-9]*.[0-9]*.[0-9]*-*'
+          fi
+
+          # Nearest tag reachable on this lineage, not just "second most recent by date"
+          prev=$(git describe --tags --abbrev=0 --match "$pattern" --tags "$base_rev" 2>/dev/null || true)
+
+          echo "tag=${prev:-0.0.0}" >> "$GITHUB_OUTPUT"
+
+
+      # 5. Generate changelog using local git (no compare API)
       - name: Generate changelog
         run: |
-          gh api repos/${{ github.repository }}/compare/${{ steps.prev_tag.outputs.tag }}...${{ steps.gitversion.outputs.fullSemVer }} \
-            --jq '.commits[].commit.message' > CHANGELOG.md
-        env:
-          GH_TOKEN: ${{ github.token }}
+          set -euo pipefail
 
-      # 6. Create release
+          prev="${{ steps.prev_tag.outputs.tag }}"
+          curr="${{ steps.gitversion.outputs.fullSemVer }}"
+
+          # Choose what you want in the raw feed: %s = subject only, %B = full message
+          GIT_LOG_FORMAT='%B'
+
+          if [[ "$prev" == "0.0.0" ]]; then
+            # First release: whole history to this tag, first-parent to reflect main’s narrative
+            git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$curr" > CHANGELOG.md
+          else
+            # Strict range between the previous reachable tag and the new tag on this lineage
+            git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$prev..$curr" > CHANGELOG.md
+          fi
+
+          # Fallback in case nothing was captured
+          if [[ ! -s CHANGELOG.md ]]; then
+            echo "No commits found between $prev and $curr on first-parent. Using full messages without first-parent filter." >&2
+            if [[ "$prev" == "0.0.0" ]]; then
+              git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$curr" > CHANGELOG.md
+            else
+              git log --no-merges --format="${GIT_LOG_FORMAT}" --reverse "$prev..$curr" > CHANGELOG.md
+            fi
+          fi
+          
+          cat CHANGELOG.md
+
+      # 5b. Rewrite changelog with OpenAI
+      - name: Rewrite changelog with OpenAI
+        id: ai_changelog
+        if: success()
+        env:
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+          OPENAI_MODEL: ${{ env.OPENAI_MODEL }}
+          OPENAI_TEMPERATURE: ${{ env.OPENAI_TEMPERATURE }}
+          MAX_CHANGELOG_CHARS: ${{ env.MAX_CHANGELOG_CHARS }}
+        run: |
+          set -euo pipefail
+
+          # Ensure we have a changelog to work with
+          if [[ ! -s CHANGELOG.md ]]; then
+            echo "CHANGELOG.md is empty. Skipping AI rewrite."
+            echo "skipped=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Trim the input to a safe size for token limits
+          head -c "${MAX_CHANGELOG_CHARS}" CHANGELOG.md > CHANGELOG_RAW.md
+
+          # Build the JSON body. We feed system guidance and the raw changelog
+          # See OpenAI Responses API docs for the schema and output_text helper. :contentReference[oaicite:0]{index=0}
+          jq -Rs --arg sys "You are an expert release-notes writer. Given a list of changes in various formats (e.g: commits, merges, etc.), write release notes intended for reading by the public, grouping by features, features, and other pertinent groups where appropriate. Do not include a group if it is not necessary / populated. Remove internal ticket IDs and commit hashes unless essential. Merge duplicates. Use imperative, past tense voice voice. Output valid Markdown only." \
+                --arg temp "${OPENAI_TEMPERATURE}" \
+                --arg model "${OPENAI_MODEL}" \
+                '{model:$model, temperature: ($temp|tonumber), input:[{role:"system", content:$sys},{role:"user", content:.}]}' CHANGELOG_RAW.md > request.json
+
+          # Call the API
+          # Basic retry on transient failures
+          for i in 1 2 3; do
+            HTTP_CODE=$(curl -sS -w "%{http_code}" -o ai_response.json \
+              https://api.openai.com/v1/responses \
+              -H "Content-Type: application/json" \
+              -H "Authorization: Bearer $OPENAI_API_KEY" \
+              --data-binary @request.json) && break || true
+            echo "Call attempt $i failed with HTTP $HTTP_CODE"
+            sleep $((i*i))
+          done
+
+          if [[ "${HTTP_CODE:-000}" -lt 200 || "${HTTP_CODE:-000}" -ge 300 ]]; then
+            echo "OpenAI API call failed with HTTP $HTTP_CODE. Keeping raw changelog."
+            echo "skipped=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # Prefer output_text if present. Fallback to first text item. :contentReference[oaicite:1]{index=1}
+          if jq -e '.output_text' ai_response.json >/dev/null; then
+            jq -r '.output_text' ai_response.json > CHANGELOG.md
+          else
+            jq -r '.output[0].content[] | select(.type=="output_text") | .text' ai_response.json | sed '/^[[:space:]]*$/d' > CHANGELOG.md
+          fi
+
+          # If the rewrite somehow produced an empty file, keep the raw one
+          if [[ ! -s CHANGELOG.md ]]; then
+            echo "AI returned empty content. Restoring raw changelog."
+            mv CHANGELOG_RAW.md CHANGELOG.md
+            echo "skipped=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          echo "skipped=false" >> $GITHUB_OUTPUT
+          echo "Rewritten changelog:"
+          cat CHANGELOG.md
+
+      # 6. Create release using the (possibly rewritten) changelog
       - name: Create GitHub release
         uses: softprops/action-gh-release@v2
         with:

CONTRIBUTING.md

@@ -3,28 +3,22 @@
 Thank you for considering contributing!
 
 By submitting code, documentation, or other contributions ("Contributions") to this project, you agree that your
-Contributions are licensed under the same terms as the project’s license (the Profit Disclosure License v1.0).
+Contributions are licensed under the same terms as the project’s license.
 
-This means your Contributions will be freely usable, modifiable, and distributable under that license.
-
-Please ensure your Contributions are your original work or that you have the necessary rights to submit them.
-
-Contributions that do not comply with the project’s license or infringe third-party rights may be rejected.
+- This means your Contributions will be freely usable, modifiable, and distributable under that license.
+- Please ensure your Contributions are your original work or that you have the necessary rights to submit them.
+- Contributions that do not comply with the project’s license or infringe third-party rights may be rejected.
 
 ---
 
 **Code Formatting Requirement**
 
-Before submitting, please format your code according to the settings provided in the `TTT.sln.DotSettings` file. This
-helps maintain code consistency and quality.
+Before submitting, please format your code according to the settings provided in the `TTT.sln.DotSettings` file.
 
 ---
 
 For substantial contributions, maintainers may request you to sign a Contributor License Agreement (CLA) to clarify
 rights and permissions.
 
----
-
 If you have questions, please contact the repository owner.
-
-Thank you for helping improve this project!
+Thank you for helping improve this project!

LICENSE

@@ -1,83 +1,660 @@
-Profit Disclosure License v1.0
-==================================
+# GNU AFFERO GENERAL PUBLIC LICENSE
 
-Copyright (c) 2025 Isaac Boaz
+Version 3, 19 November 2007
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to use,
-copy, modify, and distribute the Software, subject to the following conditions:
+Copyright (C) 2007 Free Software Foundation, Inc.
+<https://fsf.org/>
 
-1. Definitions
---------------
-"Modified versions" means any work containing the Software altered or
-adapted in any way.
-"Derivative works" means works based upon the Software, including
-translations, adaptations, or other modifications.
-"Combined works" means any software that relies on, depends on, builds on,
-or requires the Software to function in whole or in part.
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
 
-2. Non-Commercial Use
----------------------
-You may use, copy, modify, and distribute the Software freely for any
-non-commercial purpose, provided that this license and the above copyright
-notice are included in all copies or substantial portions of the Software.
+## Preamble
 
-3. Commercial and Monetized Network Use Obligations
----------------------------------------------------
-If the Software, or any portion of it, is used in a project, product, service,
-or network-accessible application (e.g., SaaS, PaaS, hosted application) that
-generates revenue or is intended for commercial gain, whether direct or indirect,
-you must:
+The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-a) Make the complete and corresponding source code of any modified versions,
-   derivative works, or combined works that include or depend on the Software
-   publicly and freely available under the terms of this same license; and
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains
+free software for all its users.
 
-b) Provide a clear and prominent offer to all users and customers of the
-   commercial product, service, or network application to obtain the full source
-   code free of charge.
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-4. Definition of Commercial Use
--------------------------------
-"Commercial use" includes, but is not limited to:
-- Selling or licensing the Software or any derivative or combined work;
-- Offering the Software as part of a paid product or service;
-- Using the Software to provide services for a fee;
-- Monetizing access via advertising, subscriptions, or affiliates;
-- Internal use by for-profit entities in products that are not themselves
-  open-sourced.
+Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
 
-5. Patent Grant
----------------
-The copyright holder grants you a limited, non-exclusive,
-royalty-free patent license to use, make, and distribute the Software as
-permitted by this license. This grant does not include any patent rights not
-necessarily infringed by the Software.
+A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-6. No Sublicensing
-------------------
-You may not sublicense the Software under terms more permissive than this
-license.
+The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-7. Termination
---------------
-Any violation of this license terminates your rights under it immediately.
-Rights may be reinstated if you cure the violation within 30 days of notice.
+An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing
+under this license.
 
-8. Governing Law and Jurisdiction
----------------------------------
-This license shall be governed by and construed in accordance with the laws of
-the jurisdiction where the copyright holder resides, without regard to conflict
-of law principles. Any dispute shall be resolved exclusively in the courts of
-that jurisdiction.
+The precise terms and conditions for copying, distribution and
+modification follow.
 
-9. No Warranty
---------------
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM, OUT OF, OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## TERMS AND CONDITIONS
 
-SPDX-License-Identifier: Profit-Disclosure-1.0
+### 0. Definitions.
+
+"This License" refers to version 3 of the GNU Affero General Public
+License.
+
+"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.
+
+An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same
+work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:
+
+-   a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+-   b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under
+    section 7. This requirement modifies the requirement in section 4
+    to "keep intact all notices".
+-   c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy. This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged. This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+-   d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:
+
+-   a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+-   b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the Corresponding
+    Source from a network server at no charge.
+-   c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source. This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+-   d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge. You need not require recipients to copy the
+    Corresponding Source along with the object code. If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+-   e) Convey the object code using peer-to-peer transmission,
+    provided you inform other peers where the object code and
+    Corresponding Source of the work are being offered to the general
+    public at no charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:
+
+-   a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+-   b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+-   c) Prohibiting misrepresentation of the origin of that material,
+    or requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+-   d) Limiting the use for publicity purposes of names of licensors
+    or authors of the material; or
+-   e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+-   f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions
+    of it) with contractual assumptions of liability to the recipient,
+    for any liability that these contractual assumptions directly
+    impose on those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+### 11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Remote Network Interaction; Use with the GNU General Public License.
+
+Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your
+version supports such interaction) an opportunity to receive the
+Corresponding Source of your version by providing access to the
+Corresponding Source from a network server at no charge, through some
+standard or customary means of facilitating copying of software. This
+Corresponding Source shall include the Corresponding Source for any
+work covered by version 3 of the GNU General Public License that is
+incorporated pursuant to the following paragraph.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions
+of the GNU Affero General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever
+published by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions
+of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+END OF TERMS AND CONDITIONS
+
+## How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+        <one line to give the program's name and a brief idea of what it does.>
+        Copyright (C) <year>  <name of author>
+
+        This program is free software: you can redistribute it and/or modify
+        it under the terms of the GNU Affero General Public License as
+        published by the Free Software Foundation, either version 3 of the
+        License, or (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU Affero General Public License for more details.
+
+        You should have received a copy of the GNU Affero General Public License
+        along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for
+the specific requirements.
+
+You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU AGPL, see <https://www.gnu.org/licenses/>.

LICENSES.MD

@@ -1,15 +1,18 @@
-| 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/                                                                         |
-| 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.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                                                               |
-| 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.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.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/                                                                      |
+| 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

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

README.md

@@ -1,4 +1,4 @@
-# TTT | [![ReadMe](https://img.shields.io/badge/ReadMe-018EF5?logo=readme&logoColor=fff&style=for-the-badge)](./TTT/README.md)
+# TTT | [![ReadMe](https://img.shields.io/badge/ReadMe-018EF5?logo=readme&logoColor=fff&style=for-the-badge)](./TTT/README.md) ![GitHub Release](https://img.shields.io/github/v/release/MSWS/TTT?style=for-the-badge)
 
 ![Code Coverage](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/MSWS/6289e1f34da3b70fbba5f84f5ffb25a1/raw/code-coverage.json)
 [![Discord](https://img.shields.io/discord/623439460683481091?style=for-the-badge&logo=discord&label=Discord)](https://msws.xyz/s/discord)

TTT.sln

@@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shop", "TTT\Shop\Shop.cspro
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Karma", "TTT\Karma\Karma.csproj", "{AFC791EC-750C-423F-9F35-87636657E990}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShopAPI", "TTT\ShopAPI\ShopAPI.csproj", "{16F720B5-9D45-47BF-8C80-4F91005E36D1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -66,6 +68,10 @@ Global
 		{AFC791EC-750C-423F-9F35-87636657E990}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AFC791EC-750C-423F-9F35-87636657E990}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AFC791EC-750C-423F-9F35-87636657E990}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16F720B5-9D45-47BF-8C80-4F91005E36D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection

TTT/API/API.csproj

@@ -6,6 +6,6 @@
     <RootNamespace>TTT.API</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5"/>
   </ItemGroup>
 </Project>

TTT/API/Command/ICommand.cs

@@ -7,7 +7,7 @@ public interface ICommand : ITerrorModule {
   string[] Usage => [];
   string[] RequiredFlags => [];
   string[] RequiredGroups => [];
-  string[] Aliases => [Name];
+  string[] Aliases => [Id];
 
   Task<CommandResult> Execute(IOnlinePlayer? executor, ICommandInfo info);
 }

TTT/API/Extensions/ServiceCollectionExtensions.cs

@@ -12,32 +12,17 @@ public static class ServiceCollectionExtensions {
   public static void AddModBehavior<TExtension>(
     this IServiceCollection collection)
     where TExtension : class, ITerrorModule {
-    if (typeof(TExtension).IsAssignableTo(typeof(IPluginModule))) {
-# if DEBUG
-      Console.WriteLine(
-        $"[DEBUG] Registering {typeof(TExtension).Name} as IPluginModule");
-# endif
+    if (typeof(TExtension).IsAssignableTo(typeof(IPluginModule)))
       collection.AddTransient<IPluginModule>(provider
         => (provider.GetRequiredService<TExtension>() as IPluginModule)!);
-    }
 
-    if (typeof(TExtension).IsAssignableTo(typeof(IListener))) {
-#if DEBUG
-      Console.WriteLine(
-        $"[DEBUG] Registering {typeof(TExtension).Name} as IListener");
-# endif
+    if (typeof(TExtension).IsAssignableTo(typeof(IListener)))
       collection.AddTransient<IListener>(provider
         => (provider.GetRequiredService<TExtension>() as IListener)!);
-    }
 
-    if (typeof(TExtension).IsAssignableTo(typeof(ICommand))) {
-#if DEBUG
-      Console.WriteLine(
-        $"[DEBUG] Registering {typeof(TExtension).Name} as ICommand");
-#endif
+    if (typeof(TExtension).IsAssignableTo(typeof(ICommand)))
       collection.AddTransient<ICommand>(provider
         => (provider.GetRequiredService<TExtension>() as ICommand)!);
-    }
 
     collection.AddScoped<TExtension>();
 

TTT/API/ITerrorModule.cs

@@ -1,7 +1,7 @@
 namespace TTT.API;
 
 public interface ITerrorModule : IDisposable {
-  string Name => GetType().Name;
+  string Id => GetType().Name;
   string Version => GitVersionInformation.FullSemVer;
 
   void Start();

TTT/API/IWeapon.cs

@@ -4,7 +4,7 @@ public interface IWeapon {
   /// <summary>
   ///   The internal ID of the weapon, should match the ID of the weapon in the underlying game.
   /// </summary>
-  public string Id { get; }
+  public string WeaponId { get; }
 
   /// <summary>
   ///   The amount of ammo that is in reserve for this weapon.

TTT/API/Player/IIconManager.cs

@@ -0,0 +1,16 @@
+namespace TTT.API.Player;
+
+/// <summary>
+///   Assumes a maximum of 64 players.
+///   Each bit in the bitmask represents whether a player is visible to the client.
+///   Bit 0 is unused, bit 1 represents player 1, bit 2 represents player 2, and so on.
+/// </summary>
+public interface IIconManager {
+  ulong GetVisiblePlayers(int client);
+  void SetVisiblePlayers(int client, ulong playersBitmask);
+  void RevealToAll(int client);
+  void AddVisiblePlayer(int client, int player);
+  void RemoveVisiblePlayer(int client, int player);
+
+  void ClearAllVisibility();
+}

TTT/API/Player/IInventoryManager.cs

@@ -6,23 +6,24 @@ public interface IInventoryManager {
   /// </summary>
   /// <param name="player">The player to give the weapon to.</param>
   /// <param name="weapon"></param>
-  void GiveWeapon(IOnlinePlayer player, IWeapon weapon);
+  Task GiveWeapon(IOnlinePlayer player, IWeapon weapon);
 
   /// <summary>
   ///   Removes a weapon from the player.
   /// </summary>
   /// <param name="player">The player to remove the weapon from.</param>
   /// <param name="weaponId">The ID of the weapon to remove.</param>
-  void RemoveWeapon(IOnlinePlayer player, string weaponId);
+  Task RemoveWeapon(IOnlinePlayer player, string weaponId);
 
-  void RemoveWeapon(IOnlinePlayer player, IWeapon weapon) {
-    RemoveWeapon(player, weapon.Id);
+  Task RemoveWeapon(IOnlinePlayer player, IWeapon weapon) {
+    return RemoveWeapon(player, weapon.WeaponId);
   }
 
+  Task RemoveWeaponInSlot(IOnlinePlayer player, int slot);
 
   /// <summary>
   ///   Removes all weapons from the player.
   /// </summary>
   /// <param name="player">The player to remove all weapons from.</param>
-  void RemoveAllWeapons(IOnlinePlayer player);
+  Task RemoveAllWeapons(IOnlinePlayer player);
 }

TTT/API/Player/IOnlinePlayer.cs

@@ -1,10 +1,6 @@
 namespace TTT.API.Player;
 
 public interface IOnlinePlayer : IPlayer {
-  // [Obsolete(
-  //   "Roles are now managed via IRoleAssigner. Use IRoleAssigner.GetRoles(IPlayer) instead.")]
-  // ICollection<IRole> Roles { get; }
-
   public int Health { get; set; }
   public int MaxHealth { get; set; }
   public int Armor { get; set; }

TTT/CS2/CS2.csproj

@@ -12,7 +12,7 @@
     <ProjectReference Include="..\API\API.csproj"/>
     <ProjectReference Include="..\Game\Game.csproj"/>
     <ProjectReference Include="..\Karma\Karma.csproj"/>
-    <ProjectReference Include="..\Shop\Shop.csproj"/>
+    <ProjectReference Include="..\ShopAPI\ShopAPI.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

TTT/CS2/CS2Body.cs

@@ -1,46 +1,25 @@
 using CounterStrikeSharp.API.Core;
-using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
-using TTT.API.Messages;
 using TTT.API.Player;
-using TTT.API.Role;
 using TTT.Game;
-using TTT.Game.Roles;
-using TTT.Locale;
 
 namespace TTT.CS2;
 
-public class CS2Body(IServiceProvider provider, CRagdollProp ragdoll,
-  IPlayer player) : IBody {
-  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 IRoleAssigner roles =
-    provider.GetRequiredService<IRoleAssigner>();
-
+public class CS2Body(CRagdollProp ragdoll, IPlayer player) : IBody {
   public CRagdollProp Ragdoll { get; } = ragdoll;
   public IPlayer OfPlayer { get; } = player;
   public bool IsIdentified { get; set; }
   public IWeapon? MurderWeapon { get; private set; }
 
-  public IPlayer? Killer { get; private set; }
+  public IPlayer? Killer { get; set; }
   public string Id { get; } = ragdoll.Index.ToString();
+  public DateTime TimeOfDeath { get; } = DateTime.Now;
 
   public CS2Body WithWeapon(IWeapon weapon) {
     MurderWeapon = weapon;
     return this;
   }
 
-  public CS2Body WithWeapon(string weapon) {
-    return WithWeapon(new BaseWeapon(weapon));
-  }
-
   public CS2Body WithKiller(IPlayer? killer) {
     Killer = killer;
     return this;

TTT/CS2/CS2ServiceCollection.cs

@@ -1,5 +1,7 @@
 using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
 using TTT.API.Command;
 using TTT.API.Extensions;
 using TTT.API.Game;
@@ -20,8 +22,6 @@ using TTT.CS2.Listeners;
 using TTT.CS2.Player;
 using TTT.Game;
 using TTT.Locale;
-using TTT.Shop;
-using TTT.Shop.Items;
 
 namespace TTT.CS2;
 
@@ -33,12 +33,15 @@ public static class CS2ServiceCollection {
         CCPlayerConverter>();
     collection.AddModBehavior<ICommandManager, CS2CommandManager>();
     collection.AddModBehavior<IAliveSpoofer, CS2AliveSpoofer>();
+    collection.AddModBehavior<IIconManager, RoleIconsHandler>();
 
     // Configs
     collection.AddModBehavior<IStorage<TTTConfig>, CS2GameConfig>();
     collection.AddModBehavior<IStorage<ShopConfig>, CS2ShopConfig>();
     collection
      .AddModBehavior<IStorage<OneShotDeagleConfig>, CS2OneShotDeagleConfig>();
+    collection.AddModBehavior<IStorage<C4Config>, CS2C4Config>();
+    collection.AddModBehavior<IStorage<M4A1Config>, CS2M4A1Config>();
 
     // TTT - CS2 Specific optionals
     collection.AddScoped<ITextSpawner, TextSpawner>();
@@ -49,8 +52,7 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<DamageCanceler>();
     collection.AddModBehavior<PlayerConnectionsHandler>();
     collection.AddModBehavior<PropMover>();
-    collection.AddModBehavior<RoleIconsHandler>();
-    collection.AddModBehavior<RoundEnd_GameEndHandler>();
+    // collection.AddModBehavior<RoundEnd_GameEndHandler>();
     collection.AddModBehavior<RoundStart_GameStartHandler>();
 
     // Damage Cancelers
@@ -63,9 +65,12 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<LateSpawnListener>();
     collection.AddModBehavior<PlayerStatsTracker>();
     collection.AddModBehavior<RoundTimerListener>();
+    collection.AddModBehavior<ScreenColorApplier>();
 
     // Commands
+#if DEBUG
     collection.AddModBehavior<TestCommand>();
+#endif
 
     collection.AddScoped<IGameManager, CS2GameManager>();
     collection.AddScoped<IInventoryManager, CS2InventoryManager>();

TTT/CS2/Command/CS2CommandManager.cs

@@ -5,8 +5,8 @@ using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Command;
 using TTT.API.Player;
-using TTT.Game;
 using TTT.Game.Commands;
+using TTT.Game.lang;
 
 namespace TTT.CS2.Command;
 

TTT/CS2/Command/Test/ForceAliveCommand.cs

@@ -12,7 +12,7 @@ public class ForceAliveCommand(IServiceProvider provider) : ICommand {
 
   public void Dispose() { }
 
-  public string Name => "forcealive";
+  public string Id => "forcealive";
 
   public void Start() { }
 

TTT/CS2/Command/Test/GiveItemCommand.cs

@@ -0,0 +1,50 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class GiveItemCommand(IServiceProvider provider) : ICommand {
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public string Id => "giveitem";
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
+
+    if (info.ArgCount == 1) return Task.FromResult(CommandResult.PRINT_USAGE);
+
+    var query = string.Join(" ", info.Args.Skip(1));
+    var item  = searchItem(query);
+    if (item == null) {
+      info.ReplySync($"Item '{query}' not found.");
+      return Task.FromResult(CommandResult.ERROR);
+    }
+
+    shop.GiveItem(executor, item);
+    info.ReplySync($"Gave item '{item.Name}' to {executor.Name}.");
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+
+  private IShopItem? searchItem(string query) {
+    var item = shop.Items.FirstOrDefault(it
+      => it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));
+
+    if (item != null) return item;
+
+    item = shop.Items.FirstOrDefault(it
+      => it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));
+
+    if (item != null) return item;
+
+    item = shop.Items.FirstOrDefault(it
+      => it.Name.Contains(query, StringComparison.OrdinalIgnoreCase));
+
+    return item;
+  }
+}

TTT/CS2/Command/Test/IdentifyAllCommand.cs

@@ -14,7 +14,7 @@ public class IdentifyAllCommand(IServiceProvider provider) : ICommand {
 
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
-  public string Name => "identifyall";
+  public string Id => "identifyall";
 
   public void Dispose() { }
   public void Start() { }

TTT/CS2/Command/Test/IndexCommand.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 IndexCommand(IServiceProvider provider) : ICommand {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public string Id => "index";
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
+
+    Server.NextWorldUpdate(() => {
+      foreach (var player in Utilities.GetPlayers())
+        info.ReplySync($"{player.PlayerName} - {player.Slot}");
+    });
+
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/ScreenColorCommand.cs

@@ -0,0 +1,35 @@
+using System.Drawing;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+using TTT.CS2.Extensions;
+
+namespace TTT.CS2.Command.Test;
+
+public class ScreenColorCommand(IServiceProvider provider) : ICommand {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public string Id => "screencolor";
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
+    Server.NextWorldUpdate(() => {
+      var   player = converter.GetPlayer(executor);
+      float hold   = 0.5f, fade = 0.5f;
+      if (info.ArgCount >= 2) float.TryParse(info.Args[1], out hold);
+      if (info.ArgCount >= 3) float.TryParse(info.Args[2], out fade);
+
+      player?.ColorScreen(Color.Red, hold, fade);
+
+      info.ReplySync("Colored your screen red.");
+    });
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/SetHealthCommand.cs

@@ -0,0 +1,27 @@
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class SetHealthCommand : ICommand {
+  public string Id => "sethealth";
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
+
+    if (info.ArgCount != 2) return Task.FromResult(CommandResult.PRINT_USAGE);
+
+    if (!int.TryParse(info.Args[1], out var health)) {
+      info.ReplySync("Invalid health value.");
+      return Task.FromResult(CommandResult.ERROR);
+    }
+
+    executor.Health = health;
+    info.ReplySync($"Set health of {executor.Name} to {health}.");
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/SetRoleCommand.cs

@@ -17,7 +17,7 @@ public class SetRoleCommand(IServiceProvider provider) : ICommand {
 
   public void Dispose() { }
 
-  public string Name => "setrole";
+  public string Id => "setrole";
   public void Start() { }
 
   public Task<CommandResult>

TTT/CS2/Command/Test/ShowIconsCommand.cs

@@ -0,0 +1,27 @@
+using CounterStrikeSharp.API;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class ShowIconsCommand(IServiceProvider provider) : ICommand {
+  private readonly IIconManager icons =
+    provider.GetRequiredService<IIconManager>();
+
+  public string Id => "showicons";
+
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    Server.NextWorldUpdate(() => {
+      for (var i = 0; i < Server.MaxPlayers; i++)
+        icons.SetVisiblePlayers(i, ulong.MaxValue);
+    });
+
+    info.ReplySync("Set all icons visible");
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/StateCommand.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Command;
+using TTT.API.Game;
+using TTT.API.Player;
+
+namespace TTT.CS2.Command.Test;
+
+public class StateCommand(IServiceProvider provider) : ICommand {
+  private readonly IGameManager games =
+    provider.GetRequiredService<IGameManager>();
+
+  public string Id => "state";
+  public void Dispose() { }
+  public void Start() { }
+
+  public Task<CommandResult>
+    Execute(IOnlinePlayer? executor, ICommandInfo info) {
+    if (games.ActiveGame == null) {
+      info.ReplySync("ActiveGame is null.");
+      return Task.FromResult(CommandResult.SUCCESS);
+    }
+
+    info.ReplySync($"Current game state: {games.ActiveGame?.State}");
+    return Task.FromResult(CommandResult.SUCCESS);
+  }
+}

TTT/CS2/Command/Test/StopCommand.cs

@@ -11,7 +11,7 @@ public class StopCommand(IServiceProvider provider) : ICommand {
     provider.GetRequiredService<IGameManager>();
 
   public void Dispose() { }
-  public string Name => "stop";
+  public string Id => "stop";
 
   public void Start() { }
 

TTT/CS2/Command/Test/TestCommand.cs

@@ -11,13 +11,19 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
 
   public void Dispose() { }
 
-  public string Name => "test";
+  public string Id => "test";
 
   public void Start() {
     subCommands.Add("setrole", new SetRoleCommand(provider));
     subCommands.Add("stop", new StopCommand(provider));
     subCommands.Add("forcealive", new ForceAliveCommand(provider));
     subCommands.Add("identifyall", new IdentifyAllCommand(provider));
+    subCommands.Add("state", new StateCommand(provider));
+    subCommands.Add("screencolor", new ScreenColorCommand(provider));
+    subCommands.Add("giveitem", new GiveItemCommand(provider));
+    subCommands.Add("index", new IndexCommand(provider));
+    subCommands.Add("showicons", new ShowIconsCommand(provider));
+    subCommands.Add("sethealth", new SetHealthCommand());
   }
 
   public Task<CommandResult>
@@ -27,7 +33,7 @@ public class TestCommand(IServiceProvider provider) : ICommand, IPluginModule {
     if (info.ArgCount == 1) {
       foreach (var c in subCommands.Values)
         info.ReplySync(
-          $"- {c.Name} {c.Usage.FirstOrDefault()}: {c.Description ?? "No description provided."}");
+          $"- {c.Id} {c.Usage.FirstOrDefault()}: {c.Description ?? "No description provided."}");
 
       return Task.FromResult(CommandResult.INVALID_ARGS);
     }

TTT/CS2/Configs/CS2GameConfig.cs

@@ -7,7 +7,7 @@ using TTT.API.Storage;
 using TTT.CS2.Validators;
 using TTT.Game;
 
-namespace TTT.CS2.Game;
+namespace TTT.CS2.Configs;
 
 public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_ROUND_COUNTDOWN = new(

TTT/CS2/Configs/CS2ShopConfig.cs

@@ -2,9 +2,9 @@
 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;
-using TTT.Shop;
 
 namespace TTT.CS2.Configs;
 

TTT/CS2/Configs/ShopItems/CS2C4Config.cs

@@ -0,0 +1,61 @@
+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;
+using TTT.CS2.Validators;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2C4Config : IStorage<C4Config>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new("css_ttt_shop_c4_price",
+    "Price of the C4 item", 140, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<string> CV_WEAPON = new(
+    "css_ttt_shop_c4_weapon", "Weapon entity name used for the C4", "weapon_c4",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: false));
+
+  public static readonly FakeConVar<int> CV_MAX_PER_ROUND = new(
+    "css_ttt_shop_c4_max_per_round",
+    "Maximum number of C4 that can be purchased per round", 0,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 64));
+
+  public static readonly FakeConVar<int> CV_MAX_AT_ONCE = new(
+    "css_ttt_shop_c4_max_at_once",
+    "Maximum number of C4 that can be active at once", 1,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 64));
+
+  public static readonly FakeConVar<float> CV_POWER = new(
+    "css_ttt_shop_c4_power", "Explosion power (damage multiplier) of the C4",
+    100f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 10000f));
+
+  public static readonly FakeConVar<int> CV_FUSE_TIME = new(
+    "css_ttt_shop_c4_fuse_time", "Fuse time of the C4 in seconds", 30,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(1, 300));
+
+  public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
+    "css_ttt_shop_c4_ff", "Whether the C4 damages teammates");
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) { plugin?.RegisterFakeConVars(this); }
+
+  public Task<C4Config?> Load() {
+    var cfg = new C4Config {
+      Price         = CV_PRICE.Value,
+      Weapon        = CV_WEAPON.Value,
+      MaxC4PerRound = CV_MAX_PER_ROUND.Value,
+      MaxC4AtOnce   = CV_MAX_AT_ONCE.Value,
+      Power         = CV_POWER.Value,
+      FuseTime      = TimeSpan.FromSeconds(CV_FUSE_TIME.Value),
+      FriendlyFire  = CV_FRIENDLY_FIRE.Value
+    };
+
+    return Task.FromResult<C4Config?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2M4A1Config.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;
+using TTT.API;
+using TTT.API.Storage;
+using TTT.CS2.Validators;
+
+namespace TTT.CS2.Configs.ShopItems;
+
+public class CS2M4A1Config : IStorage<M4A1Config>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_m4a1_price", "Price of the M4A1 item", 90,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<string> CV_CLEAR_SLOTS = new(
+    "css_ttt_shop_m4a1_clear_slots",
+    "Slots to clear when granting M4A1 (comma-separated ints)", "0,1");
+
+  public static readonly FakeConVar<string> CV_WEAPONS = new(
+    "css_ttt_shop_m4a1_weapons",
+    "Weapons granted with this item (comma-separated names)",
+    "weapon_m4a1,weapon_usp_silencer", ConVarFlags.FCVAR_NONE,
+    new ItemValidator(allowMultiple: true));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<M4A1Config?> Load() {
+    var slots = CV_CLEAR_SLOTS.Value.Split(',')
+     .Select(s => s.Trim())
+     .Where(s => int.TryParse(s, out _))
+     .Select(int.Parse)
+     .ToArray();
+
+    var weapons = CV_WEAPONS.Value.Split(',')
+     .Select(s => s.Trim())
+     .Where(s => !string.IsNullOrEmpty(s))
+     .ToArray();
+
+    var cfg = new M4A1Config {
+      Price = CV_PRICE.Value, ClearSlots = slots, Weapons = weapons
+    };
+
+    return Task.FromResult<M4A1Config?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2OneShotDeagleConfig.cs

@@ -2,42 +2,44 @@
 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;
 using TTT.CS2.Validators;
-using TTT.Shop.Items;
 
 namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2OneShotDeagleConfig : IStorage<OneShotDeagleConfig>,
   IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(
-    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 100,
+    "css_ttt_shop_onedeagle_price", "Price of the One-Shot Deagle item", 120,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<bool> CV_FRIENDLY_FIRE = new(
     "css_ttt_shop_onedeagle_ff",
-    "Whether the One-Shot Deagle damages teammates", true);
+    "Whether the One-Shot Deagle damages teammates");
+
+  public static readonly FakeConVar<bool> CV_KILL_SHOOTER_ON_FF = new(
+    "css_ttt_shop_onedeagle_kill_shooter_on_ff",
+    "Whether the shooter is killed if they shoot a teammate", true);
 
   public static readonly FakeConVar<string> CV_WEAPON = new(
     "css_ttt_shop_onedeagle_weapon",
-    "Weapon entity name used for the One-Shot Deagle", "weapon_revolver",
-    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: false));
+    "Weapon entity name used for the One-Shot Weapon", "weapon_revolver",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowEmpty: false));
 
   public void Dispose() { }
 
   public void Start() { }
 
-  public void Start(BasePlugin? plugin) {
-    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
-    plugin.RegisterFakeConVars(this);
-  }
+  public void Start(BasePlugin? plugin) { plugin?.RegisterFakeConVars(this); }
 
   public Task<OneShotDeagleConfig?> Load() {
     var cfg = new OneShotDeagleConfig {
       Price            = CV_PRICE.Value,
       DoesFriendlyFire = CV_FRIENDLY_FIRE.Value,
-      Weapon           = CV_WEAPON.Value
+      Weapon           = CV_WEAPON.Value,
+      KillShooterOnFF  = CV_KILL_SHOOTER_ON_FF.Value
     };
 
     return Task.FromResult<OneShotDeagleConfig?>(cfg);

TTT/CS2/Extensions/PlayerExtensions.cs

@@ -1,10 +1,15 @@
 using System.Drawing;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.UserMessages;
 
 namespace TTT.CS2.Extensions;
 
 public static class PlayerExtensions {
+  public enum FadeFlags {
+    FADE_IN, FADE_OUT, FADE_STAYOUT
+  }
+
   public static CBasePlayerWeapon? GetWeaponBase(
     this CCSPlayerController player, string designerName) {
     if (!player.IsValid) return null;
@@ -25,13 +30,57 @@ public static class PlayerExtensions {
     ev.FireEvent(false);
   }
 
+  public static void SetHealth(this CCSPlayerController player, int health) {
+    if (player.Pawn.Value == null) return;
+    if (health <= 0) {
+      player.CommitSuicide(false, true);
+      return;
+    }
+
+    player.Pawn.Value.Health = health;
+    Utilities.SetStateChanged(player.Pawn.Value, "CBaseEntity", "m_iHealth");
+  }
+
+  public static int GetHealth(this CCSPlayerController player) {
+    return player.Pawn.Value?.Health ?? 0;
+  }
+
+  public static void AddHealth(this CCSPlayerController player, int health) {
+    if (player.Pawn.Value == null) return;
+    player.SetHealth(player.Pawn.Value.Health + health);
+  }
+
   public static void SetColor(this CCSPlayerController player, Color color) {
     if (!player.IsValid) return;
     var pawn = player.Pawn.Value;
     if (!player.IsValid || pawn == null || !pawn.IsValid) return;
 
     if (color.A == 255)
-      color = Color.FromArgb(pawn.Render.A, color.R, color.G, color.B);
+      color = Color.FromArgb(pawn.Render.A == 255 ? 255 : 254, color.R, color.G,
+        color.B);
     pawn.SetColor(color);
   }
+
+  public static void ColorScreen(this CCSPlayerController player, Color color,
+    float hold = 0.1f, float fade = 0.2f, FadeFlags flags = FadeFlags.FADE_IN,
+    bool withPurge = true) {
+    var fadeMsg = UserMessage.FromId(106);
+
+    fadeMsg.SetInt("duration", Convert.ToInt32(fade * 512));
+    fadeMsg.SetInt("hold_time", Convert.ToInt32(hold * 512));
+
+    var flag = flags switch {
+      FadeFlags.FADE_IN      => 0x0001,
+      FadeFlags.FADE_OUT     => 0x0002,
+      FadeFlags.FADE_STAYOUT => 0x0008,
+      _                      => 0x0001
+    };
+
+    if (withPurge) flag |= 0x0010;
+
+    fadeMsg.SetInt("flags", flag);
+    fadeMsg.SetInt("color",
+      color.R | color.G << 8 | color.B << 16 | color.A << 24);
+    fadeMsg.Send(player);
+  }
 }

TTT/CS2/Extensions/VectorExtensions.cs

@@ -46,6 +46,40 @@ public static class VectorExtensions {
       (float)(Math.Sin(yaw) * cosPitch), (float)-Math.Sin(pitch));
   }
 
+  public static Vector ToRight(this QAngle angle) {
+    var pitch = angle.X * (Math.PI / 180.0);
+    var yaw   = angle.Y * (Math.PI / 180.0);
+    var roll  = angle.Z * (Math.PI / 180.0);
+
+    var sinPitch = Math.Sin(pitch);
+    var cosPitch = Math.Cos(pitch);
+    var sinYaw   = Math.Sin(yaw);
+    var cosYaw   = Math.Cos(yaw);
+    var sinRoll  = Math.Sin(roll);
+    var cosRoll  = Math.Cos(roll);
+
+    return new Vector((float)(sinYaw * sinPitch * cosRoll - cosYaw * sinRoll),
+      (float)(-cosYaw * sinPitch * cosRoll - sinYaw * sinRoll),
+      (float)(cosPitch * -sinRoll));
+  }
+
+  public static Vector ToUp(this QAngle angle) {
+    var pitch = angle.X * (Math.PI / 180.0);
+    var yaw   = angle.Y * (Math.PI / 180.0);
+    var roll  = angle.Z * (Math.PI / 180.0);
+
+    var sinPitch = Math.Sin(pitch);
+    var cosPitch = Math.Cos(pitch);
+    var sinYaw   = Math.Sin(yaw);
+    var cosYaw   = Math.Cos(yaw);
+    var sinRoll  = Math.Sin(roll);
+    var cosRoll  = Math.Cos(roll);
+
+    return new Vector((float)(-cosYaw * sinPitch * cosRoll - sinYaw * sinRoll),
+      (float)(-sinYaw * sinPitch * cosRoll + cosYaw * sinRoll),
+      (float)(cosPitch * cosRoll));
+  }
+
   public static Vector Lerp(this Vector from, Vector to, float t) {
     return new Vector(from.X + (to.X - from.X) * t,
       from.Y + (to.Y - from.Y) * t, from.Z + (to.Z - from.Z) * t);

TTT/CS2/Game/CS2Game.cs

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

TTT/CS2/Game/CS2GameManager.cs

@@ -1,11 +1,17 @@
-using TTT.API.Game;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Game;
+using TTT.API.Messages;
 using TTT.Game;
 using TTT.Game.Events.Game;
 
 namespace TTT.CS2.Game;
 
 public class CS2GameManager(IServiceProvider provider) : GameManager(provider) {
+  protected readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
   public override IGame CreateGame() {
+    messenger.Debug("Attempting to create a new CS2 game...");
     switch (ActiveGame) {
       case { State: State.IN_PROGRESS or State.COUNTDOWN }:
         throw new InvalidOperationException(
@@ -14,6 +20,7 @@ public class CS2GameManager(IServiceProvider provider) : GameManager(provider) {
         return ActiveGame;
     }
 
+    messenger.Debug("Creating a new CS2 game instance...");
     ActiveGame = new CS2Game(Provider);
 
     var ev = new GameInitEvent(ActiveGame);

TTT/CS2/GameHandlers/BodySpawner.cs

@@ -4,6 +4,7 @@ using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
 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;
@@ -11,6 +12,7 @@ using TTT.API.Game;
 using TTT.API.Player;
 using TTT.CS2.Extensions;
 using TTT.Game.Events.Body;
+using TTT.Game.Roles;
 
 namespace TTT.CS2.GameHandlers;
 
@@ -26,21 +28,22 @@ public class BodySpawner(IServiceProvider provider) : IPluginModule {
   public void Dispose() { }
   public void Start() { }
 
+  [UsedImplicitly]
   [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, 0, 0, 0));
+    player.SetColor(Color.FromArgb(0, 255, 255, 255));
 
     var ragdollBody = makeGameRagdoll(player);
-    var body = new CS2Body(provider, ragdollBody, converter.GetPlayer(player));
+    var body        = new CS2Body(ragdollBody, converter.GetPlayer(player));
 
     if (ev.Attacker != null && ev.Attacker.IsValid)
       body.WithKiller(converter.GetPlayer(ev.Attacker));
 
-    body.WithWeapon(ev.Weapon);
+    body.WithWeapon(new BaseWeapon(ev.Weapon));
 
     var bodyCreatedEvent = new BodyCreateEvent(body);
     bus.Dispatch(bodyCreatedEvent);
@@ -49,11 +52,12 @@ public class BodySpawner(IServiceProvider provider) : IPluginModule {
     return HookResult.Continue;
   }
 
+  [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnStart(EventRoundStart ev, GameEventInfo _) {
     Server.NextWorldUpdate(() => {
       foreach (var player in Utilities.GetPlayers())
-        player.SetColor(Color.FromArgb(254, 255, 255, 255));
+        player.SetColor(Color.White);
     });
     return HookResult.Continue;
   }

TTT/CS2/GameHandlers/KarmaSyncer.cs

@@ -18,7 +18,7 @@ public class KarmaSyncer(IServiceProvider provider) : IPluginModule {
     provider.GetRequiredService<IPlayerFinder>();
 
   public void Dispose() { }
-  public string Name => nameof(KarmaSyncer);
+  public string Id => nameof(KarmaSyncer);
   public string Version => GitVersionInformation.FullSemVer;
 
   public void Start() { }

TTT/CS2/GameHandlers/PlayerConnectionsHandler.cs

@@ -3,8 +3,6 @@ using CounterStrikeSharp.API.Core;
 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.Game.Events.Player;
 
@@ -17,12 +15,6 @@ public class PlayerConnectionsHandler(IServiceProvider provider)
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly IGameManager games =
-    provider.GetRequiredService<IGameManager>();
-
-  private readonly IMessenger messenger =
-    provider.GetRequiredService<IMessenger>();
-
   public void Start() { }
 
   public void Start(BasePlugin? plugin, bool hotReload) {
@@ -34,12 +26,12 @@ public class PlayerConnectionsHandler(IServiceProvider provider)
         CounterStrikeSharp.API.Core.Listeners.OnClientDisconnect>(
         disconnectFromServer);
 
-    Server.NextWorldUpdate(() => {
-      foreach (var ev in Utilities.GetPlayers()
-       .Select(player => converter.GetPlayer(player))
-       .Select(gamePlayer => new PlayerJoinEvent(gamePlayer)))
-        bus.Dispatch(ev);
-    });
+    if (!hotReload) return;
+
+    foreach (var ev in Utilities.GetPlayers()
+     .Select(player => converter.GetPlayer(player))
+     .Select(gamePlayer => new PlayerJoinEvent(gamePlayer)))
+      bus.Dispatch(ev);
   }
 
   public void Dispose() { }

TTT/CS2/GameHandlers/RoleIconsHandler.cs

@@ -1,4 +1,6 @@
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
 using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
@@ -18,15 +20,17 @@ using TTT.Game.Roles;
 namespace TTT.CS2.GameHandlers;
 
 public class RoleIconsHandler(IServiceProvider provider)
-  : BaseListener(provider), IPluginModule {
+  : BaseListener(provider), IPluginModule, IIconManager {
   private static readonly string CT_MODEL =
     "characters/models/ctm_fbi/ctm_fbi_varianth.vmdl";
 
   private static readonly string T_MODEL =
     "characters/models/tm_phoenix/tm_phoenix.vmdl";
 
-  private readonly IDictionary<int, IEnumerable<CPointWorldText>>
-    detectiveIcons = new Dictionary<int, IEnumerable<CPointWorldText>>();
+  // private readonly IDictionary<int, IEnumerable<CPointWorldText>> icons =
+  //   new Dictionary<int, IEnumerable<CPointWorldText>>();
+  private readonly IEnumerable<CPointWorldText>?[] icons =
+    new IEnumerable<CPointWorldText>[64];
 
   private readonly IPlayerConverter<CCSPlayerController> players =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
@@ -34,24 +38,65 @@ public class RoleIconsHandler(IServiceProvider provider)
   private readonly ITextSpawner? textSpawner =
     provider.GetService<ITextSpawner>();
 
-  private readonly IDictionary<int, IEnumerable<CPointWorldText>> traitorIcons =
-    new Dictionary<int, IEnumerable<CPointWorldText>>();
+  private readonly HashSet<int> traitorsThisRound = new();
 
-  private readonly ISet<int> traitors = new HashSet<int>();
+  private readonly ulong[] visibilities = new ulong[64];
 
-  public void Start(BasePlugin? plugin) {
+  public ulong GetVisiblePlayers(int client) {
+    if (client < 1 || client >= visibilities.Length)
+      throw new ArgumentOutOfRangeException(nameof(client));
+    return visibilities[client];
+  }
+
+  public void SetVisiblePlayers(int client, ulong playersBitmask) {
+    guardRange(client, nameof(client));
+    visibilities[client] = playersBitmask;
+  }
+
+  public void RevealToAll(int client) {
+    guardRange(client, nameof(client));
+    for (var i = 0; i < visibilities.Length; i++)
+      visibilities[i] |= 1UL << client;
+  }
+
+  public void AddVisiblePlayer(int client, int player) {
+    guardRange(client, nameof(client));
+    guardRange(player, nameof(player));
+    visibilities[client] |= 1UL << player;
+  }
+
+  public void RemoveVisiblePlayer(int client, int player) {
+    guardRange(client, nameof(client));
+    guardRange(player, nameof(player));
+    visibilities[client] &= ~(1UL << player);
+  }
+
+  public void ClearAllVisibility() {
+    Array.Clear(visibilities, 0, visibilities.Length);
+  }
+
+  public void Start(BasePlugin? plugin, bool hotReload) {
     plugin
     ?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.CheckTransmit>(
         onTransmit);
   }
 
+  [GameEventHandler]
+  public HookResult OnRoundEnd(EventRoundStart _, GameEventInfo _1) {
+    foreach (var text in Utilities
+     .FindAllEntitiesByDesignerName<CPointWorldText>("point_worldtext"))
+      text.AcceptInput("Kill");
+
+    return HookResult.Continue;
+  }
+
   [UsedImplicitly]
   [EventHandler(IgnoreCanceled = true)]
   public void OnRoundStart(GameStateUpdateEvent ev) {
     if (ev.NewState != State.IN_PROGRESS) return;
-    traitors.Clear();
-    traitorIcons.Clear();
-    detectiveIcons.Clear();
+    for (var i = 0; i < icons.Length; i++) removeIcon(i);
+    ClearAllVisibility();
+    traitorsThisRound.Clear();
   }
 
   [UsedImplicitly]
@@ -66,7 +111,7 @@ public class RoleIconsHandler(IServiceProvider provider)
     }
 
     // Remove in case we're re-assigning for some reason
-    removeAllIcons(player);
+    removeIcon(player.Slot);
 
     player.SwitchTeam(ev.Role is DetectiveRole ?
       CsTeam.CounterTerrorist :
@@ -77,10 +122,36 @@ public class RoleIconsHandler(IServiceProvider provider)
     if (pawn == null || !pawn.IsValid) return;
 
     pawn.SetModel(ev.Role is DetectiveRole ? CT_MODEL : T_MODEL);
-
-    if (ev.Role is InnocentRole) return;
-
     assignIcon(player, ev.Role);
+
+    switch (ev.Role) {
+      case DetectiveRole: {
+        for (var i = 0; i < Server.MaxPlayers; i++)
+          AddVisiblePlayer(i, player.Slot);
+        break;
+      }
+      case TraitorRole: {
+        traitorsThisRound.Add(player.Slot);
+
+        foreach (var traitor in traitorsThisRound) {
+          AddVisiblePlayer(traitor, player.Slot);
+          AddVisiblePlayer(player.Slot, traitor);
+        }
+
+        break;
+      }
+    }
+  }
+
+  private void removeIcon(int slot) {
+    var existing = icons[slot];
+    if (existing == null) return;
+    foreach (var ent in existing) {
+      if (!ent.IsValid) continue;
+      ent.AcceptInput("Kill");
+    }
+
+    icons[slot] = null;
   }
 
   private void assignIcon(CCSPlayerController player, IRole role) {
@@ -88,39 +159,8 @@ public class RoleIconsHandler(IServiceProvider provider)
       msg = role.Name.First(char.IsAsciiLetter).ToString(), color = role.Color
     };
     var roleIcon = textSpawner?.CreateTextHat(textSettings, player);
-
     if (roleIcon == null) return;
-
-    if (role is DetectiveRole) {
-      detectiveIcons[player.Slot] = roleIcon;
-      return;
-    }
-
-    traitors.Add(player.Slot);
-    traitorIcons[player.Slot] = roleIcon;
-  }
-
-  private void removeAllIcons(CCSPlayerController player) {
-    removeTraitorIcon(player);
-    removeDetectiveIcon(player);
-  }
-
-  private void removeTraitorIcon(CCSPlayerController player) {
-    removeIcons(player.Slot, traitorIcons);
-  }
-
-  private void removeDetectiveIcon(CCSPlayerController player) {
-    removeIcons(player.Slot, detectiveIcons);
-  }
-
-  private void removeIcons(int slot,
-    IDictionary<int, IEnumerable<CPointWorldText>> cache) {
-    cache.Remove(slot, out var icons);
-    if (icons == null) return;
-    foreach (var icon in icons) {
-      if (!icon.IsValid) continue;
-      icon.Remove();
-    }
+    icons[player.Slot] = roleIcon;
   }
 
   [EventHandler(Priority = Priority.MONITOR)]
@@ -128,16 +168,29 @@ public class RoleIconsHandler(IServiceProvider provider)
     var gamePlayer = players.GetPlayer(ev.Victim);
     if (gamePlayer == null || !gamePlayer.IsValid) return;
 
-    removeAllIcons(gamePlayer);
+    removeIcon(gamePlayer.Slot);
   }
 
-  // ReSharper disable once PossiblyImpureMethodCallOnReadonlyVariable
   private void onTransmit(CCheckTransmitInfoList infoList) {
     foreach (var (info, player) in infoList) {
       if (player == null || !player.IsValid) continue;
-      if (traitors.Contains(player.Slot)) continue;
-      foreach (var icon in traitorIcons.Values.SelectMany(s => s))
-        info.TransmitEntities.Remove(icon);
+      hideIcons(info, player.Slot);
     }
   }
+
+  private void hideIcons(CCheckTransmitInfo info, int source) {
+    var visible = visibilities[source];
+    if (visible == ulong.MaxValue) return;
+    for (var i = 0; i < icons.Length; i++) {
+      if ((visible & 1UL << i) != 0) continue;
+      var iconList = icons[i];
+      if (iconList == null) continue;
+      foreach (var icon in iconList) info.TransmitEntities.Remove(icon);
+    }
+  }
+
+  private void guardRange(int index, string name) {
+    if (index < 0 || index >= visibilities.Length)
+      throw new ArgumentOutOfRangeException(name);
+  }
 }

TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs

@@ -4,6 +4,7 @@ using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Game;
+using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.Game;
 
@@ -15,6 +16,9 @@ public class RoundStart_GameStartHandler(IServiceProvider provider)
     provider.GetService<IStorage<TTTConfig>>()?.Load().GetAwaiter().GetResult()
     ?? new TTTConfig();
 
+  private readonly IPlayerFinder finder =
+    provider.GetRequiredService<IPlayerFinder>();
+
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
@@ -28,6 +32,9 @@ public class RoundStart_GameStartHandler(IServiceProvider provider)
     if (games.ActiveGame is { State: State.IN_PROGRESS or State.COUNTDOWN })
       return HookResult.Continue;
 
+    var count = finder.GetOnline().Count;
+    if (count < config.RoundCfg.MinimumPlayers) return HookResult.Continue;
+
     var game = games.CreateGame();
     game?.Start(config.RoundCfg.CountDownDuration);
     return HookResult.Continue;

TTT/CS2/Hats/ITextSpawner.cs

@@ -19,4 +19,7 @@ public interface ITextSpawner {
 
   IEnumerable<CPointWorldText> CreateTextHat(TextSetting setting,
     CCSPlayerController player);
+
+  IEnumerable<CPointWorldText> CreateTextScreen(TextSetting setting,
+    CCSPlayerController player);
 }

TTT/CS2/Hats/TextSpawner.cs

@@ -2,6 +2,7 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
 using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;
 
 namespace TTT.CS2.Hats;
@@ -36,6 +37,31 @@ public class TextSpawner : ITextSpawner {
     return [one, two];
   }
 
+  public IEnumerable<CPointWorldText> CreateTextScreen(TextSetting setting,
+    CCSPlayerController player) {
+    var screen = spawnScreen(setting, player);
+    return [screen];
+  }
+
+  public CPointWorldText spawnScreen(TextSetting setting,
+    CCSPlayerController player, float xOff = 0, float yOff = 0,
+    float zDist = 50) {
+    if (player.Pawn.Value == null || player.Pawn.Value.AbsRotation == null)
+      throw new Exception("Failed to get player rotation");
+    var eyes       = player.GetEyePosition().Clone()!;
+    var localAngle = player.Pawn.Value.AbsRotation.Clone()!;
+    var forward    = localAngle.Clone()!.ToForward();
+    var right      = localAngle.ToRight();
+    var up         = localAngle.ToUp();
+    var inFront    = eyes + forward * zDist;
+    var centered   = inFront + right * xOff + up * yOff;
+
+    var ent = CreateText(setting, centered,
+      new QAngle(localAngle.X + 180, localAngle.Y + 90, localAngle.Z + 270));
+    ent.AcceptInput("SetParent", player.Pawn.Value, null, "!activator");
+    return ent;
+  }
+
   private CPointWorldText spawnHatPart(TextSetting setting,
     CCSPlayerController player, float yRot) {
     var position = player.Pawn.Value?.AbsOrigin;
@@ -46,19 +72,10 @@ public class TextSpawner : ITextSpawner {
     position.Add(new Vector(0, 0, 72));
     rotation = new QAngle(rotation.X, rotation.Y + yRot, rotation.Z + 90);
 
-    position.Add(GetRightVector(rotation) * -10);
+    position.Add(rotation.ToRight() * -10);
 
     var ent = CreateText(setting, position, rotation);
     ent.AcceptInput("SetParent", player.Pawn.Value, null, "!activator");
     return ent;
   }
-
-  public static Vector GetRightVector(QAngle rotation) {
-    var forward = new Vector {
-      X = (float)Math.Cos(rotation.Y * Math.PI / 180),
-      Y = (float)Math.Sin(rotation.Y * Math.PI / 180),
-      Z = 0
-    };
-    return forward;
-  }
 }

TTT/CS2/Items/BodyPaint/BodyPaintItem.cs

@@ -0,0 +1,35 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+using TTT.Shop.Items.Traitor.BodyPaint;
+
+namespace TTT.CS2.Items.BodyPaint;
+
+public static class BodyPaintServicesCollection {
+  public static void AddBodyPaintServices(this IServiceCollection collection) {
+    collection.AddModBehavior<BodyPaintItem>();
+    collection.AddModBehavior<BodyPaintListener>();
+  }
+}
+
+public class BodyPaintItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  private readonly BodyPaintConfig config = provider
+   .GetService<IStorage<BodyPaintConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new BodyPaintConfig();
+
+  public override string Name => Locale[BodyPaintMsgs.SHOP_ITEM_BODY_PAINT];
+
+  public override string Description
+    => Locale[BodyPaintMsgs.SHOP_ITEM_BODY_PAINT_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) { }
+}

TTT/CS2/Items/BodyPaint/BodyPaintListener.cs

@@ -0,0 +1,60 @@
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Events;
+using TTT.API.Events;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.API;
+using TTT.CS2.Extensions;
+using TTT.Game.Events.Body;
+using TTT.Game.Listeners;
+using TTT.Shop.Items.Traitor.BodyPaint;
+
+namespace TTT.CS2.Items.BodyPaint;
+
+public class BodyPaintListener(IServiceProvider provider)
+  : BaseListener(provider) {
+  private readonly BodyPaintConfig config =
+    provider.GetService<IStorage<BodyPaintConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new BodyPaintConfig();
+
+  private readonly Dictionary<IPlayer, int> uses = new();
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnPurchase(PlayerPurchaseItemEvent ev) {
+    if (ev.Item is not BodyPaintItem) return;
+    if (ev.Player is not IOnlinePlayer online) return;
+    uses.TryAdd(online, 0);
+    uses[online] += config.MaxUses;
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void BodyIdentify(BodyIdentifyEvent ev) {
+    if (!bodies.Bodies.TryGetValue(ev.Body, out var body)) return;
+    if (ev.Identifier == null || !usePaint(ev.Identifier)) return;
+    ev.IsCanceled = true;
+    body.SetColor(config.ColorToApply);
+  }
+
+  private bool usePaint(IPlayer player) {
+    if (player is not IOnlinePlayer online) return false;
+    if (!uses.TryGetValue(player, out var useCount)) return false;
+
+    if (useCount <= 0) return false;
+    uses[player] = useCount - 1;
+    if (uses[player] > 0) return true;
+    shop.RemoveItem<BodyPaintItem>(online);
+    Messenger.Message(online, Locale[BodyPaintMsgs.SHOP_ITEM_BODY_PAINT_OUT]);
+    return true;
+  }
+}

TTT/CS2/Items/BodyPaint/BodyPaintMsgs.cs

@@ -0,0 +1,14 @@
+using TTT.Locale;
+
+namespace TTT.Shop.Items.Traitor.BodyPaint;
+
+public class BodyPaintMsgs {
+  public static IMsg SHOP_ITEM_BODY_PAINT
+    => MsgFactory.Create(nameof(SHOP_ITEM_BODY_PAINT));
+
+  public static IMsg SHOP_ITEM_BODY_PAINT_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_BODY_PAINT_DESC));
+  
+  public static IMsg SHOP_ITEM_BODY_PAINT_OUT
+    => MsgFactory.Create(nameof(SHOP_ITEM_BODY_PAINT_OUT));
+}

TTT/CS2/Items/Camouflage/CamoMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.Camouflage;
+
+public class CamoMsgs {
+  public static IMsg SHOP_ITEM_CAMO
+    => MsgFactory.Create(nameof(SHOP_ITEM_CAMO));
+
+  public static IMsg SHOP_ITEM_CAMO_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_CAMO_DESC));
+}

TTT/CS2/Items/Camouflage/CamouflageItem.cs

@@ -0,0 +1,45 @@
+using System.Drawing;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+
+namespace TTT.CS2.Items.Camouflage;
+
+public static class CamoServiceCollection {
+  public static void AddCamoServices(this IServiceCollection collection) {
+    collection.AddModBehavior<CamouflageItem>();
+  }
+}
+
+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>>();
+
+  public override string Name => Locale[CamoMsgs.SHOP_ITEM_CAMO];
+  public override string Description => Locale[CamoMsgs.SHOP_ITEM_CAMO_DESC];
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Server.NextWorldUpdate(() => {
+      var gamePlayer = converter.GetPlayer(player);
+      var alpha      = (int)Math.Round(config.CamoVisibility * 255);
+      gamePlayer?.SetColor(Color.FromArgb(alpha, Color.White));
+    });
+  }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return Shop.HasItem<CamouflageItem>(player) ?
+      PurchaseResult.ALREADY_OWNED :
+      PurchaseResult.SUCCESS;
+  }
+}

TTT/CS2/Items/DNA/DnaListener.cs

@@ -0,0 +1,95 @@
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Detective;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.API;
+using TTT.CS2.Events;
+using TTT.Game.Events.Game;
+using TTT.Game.Listeners;
+
+namespace TTT.CS2.Items.DNA;
+
+public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
+  private static readonly TimeSpan cooldown = TimeSpan.FromSeconds(15);
+
+  private static readonly string[] missingDnaExplanations = {
+    "the killer used gloves... for their bullets",
+    "the killer was very careful", "the killer wiped the weapon clean",
+    "the killer retrieved the bullets", "the bullets disintegrated on impact",
+    "the killer was GOATed", "but no DNA was found",
+    "but legal litigation caused the DNA to be lost",
+    "and confirmed they were dead", "and they will remember that", "good job"
+  };
+
+  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>();
+
+  // Low priority to allow body identification to happen first
+  [UsedImplicitly]
+  [EventHandler(Priority = Priority.LOW)]
+  public void OnPropPickup(PropPickupEvent ev) {
+    if (ev.Player is not IOnlinePlayer player) return;
+    if (!shop.HasItem<DnaScanner>(player)) return;
+
+    if (!bodies.TryLookup(ev.Prop.Index.ToString(), out var body)) return;
+    if (body == null) return;
+
+    var victimRole = Roles.GetRoles(body.OfPlayer).FirstOrDefault();
+    if (victimRole == null) return;
+
+    if (lastMessages.TryGetValue(player.Id + "." + body.Id,
+      out var lastMessageTime))
+      if (DateTime.Now - lastMessageTime < cooldown)
+        return;
+
+    lastMessages[player.Id + "." + body.Id] = DateTime.Now;
+
+    if (DateTime.Now - body.TimeOfDeath > config.DecayTime) {
+      Messenger.Message(player,
+        Locale[DnaMsgs.SHOP_ITEM_DNA_EXPIRED(victimRole, body.OfPlayer)]);
+      return;
+    }
+
+    if (body.Killer == null) {
+      var explanation =
+        missingDnaExplanations[
+          Random.Shared.Next(missingDnaExplanations.Length)];
+      Messenger.Message(player,
+        Locale[
+          DnaMsgs.SHOP_ITEM_DNA_SCANNED_OTHER(victimRole, body.OfPlayer,
+            explanation)]);
+      return;
+    }
+
+    if (body.Killer == body.OfPlayer) {
+      Messenger.Message(player,
+        Locale[
+          DnaMsgs.SHOP_ITEM_DNA_SCANNED_SUICIDE(victimRole, body.OfPlayer)]);
+      return;
+    }
+
+    Messenger.Message(player,
+      Locale[
+        DnaMsgs.SHOP_ITEM_DNA_SCANNED(victimRole, body.OfPlayer, body.Killer)]);
+  }
+
+  [EventHandler]
+  public void OnRoundEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+    lastMessages.Clear();
+  }
+}

TTT/CS2/Items/DNA/DnaMsgs.cs

@@ -0,0 +1,36 @@
+using TTT.API.Player;
+using TTT.API.Role;
+using TTT.Game.lang;
+using TTT.Locale;
+
+namespace TTT.CS2.Items.DNA;
+
+public class DnaMsgs {
+  public static IMsg SHOP_ITEM_DNA => MsgFactory.Create(nameof(SHOP_ITEM_DNA));
+
+  public static IMsg SHOP_ITEM_DNA_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_DNA_DESC));
+
+  public static IMsg SHOP_ITEM_DNA_SCANNED(IRole victimRole, IPlayer player,
+    IPlayer killer) {
+    return MsgFactory.Create(nameof(SHOP_ITEM_DNA_SCANNED),
+      GameMsgs.GetRolePrefix(victimRole), player.Name, killer.Name);
+  }
+
+  public static IMsg SHOP_ITEM_DNA_SCANNED_OTHER(IRole victimRole,
+    IPlayer player, string explanation) {
+    return MsgFactory.Create(nameof(SHOP_ITEM_DNA_SCANNED_OTHER),
+      GameMsgs.GetRolePrefix(victimRole), player.Name, explanation);
+  }
+
+  public static IMsg
+    SHOP_ITEM_DNA_SCANNED_SUICIDE(IRole victimRole, IPlayer player) {
+    return SHOP_ITEM_DNA_SCANNED_OTHER(victimRole, player,
+      "they killed themselves");
+  }
+
+  public static IMsg SHOP_ITEM_DNA_EXPIRED(IRole victimRole, IPlayer player) {
+    return MsgFactory.Create(nameof(SHOP_ITEM_DNA_EXPIRED),
+      GameMsgs.GetRolePrefix(victimRole), player.Name);
+  }
+}

TTT/CS2/Items/DNA/DnaScanner.cs

@@ -0,0 +1,37 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Detective;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.DNA;
+
+public static class DnaScannerServiceCollection {
+  public static void AddDnaScannerServices(this IServiceCollection collection) {
+    collection.AddModBehavior<DnaScanner>();
+    collection.AddModBehavior<DnaListener>();
+  }
+}
+
+public class DnaScanner(IServiceProvider provider)
+  : RoleRestrictedItem<DetectiveRole>(provider) {
+  private readonly 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];
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) { }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    if (Shop.HasItem(player, this)) return PurchaseResult.ALREADY_OWNED;
+    return base.CanPurchase(player);
+  }
+}

TTT/CS2/Items/PoisonShots/PoisonShotMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.PoisonShots;
+
+public class PoisonShotMsgs {
+  public static IMsg SHOP_ITEM_POISON_SHOTS
+    => MsgFactory.Create(nameof(SHOP_ITEM_POISON_SHOTS));
+
+  public static IMsg SHOP_ITEM_POISON_SHOTS_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_POISON_SHOTS_DESC));
+}

TTT/CS2/Items/PoisonShots/PoisonShotsItem.cs

@@ -0,0 +1,18 @@
+using ShopAPI;
+using ShopAPI.Configs;
+using TTT.API.Player;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.PoisonShots;
+
+public class PoisonShotsItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  public override string Name => Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS];
+
+  public override string Description
+    => Locale[PoisonShotMsgs.SHOP_ITEM_POISON_SHOTS_DESC];
+
+  public override ShopItemConfig Config { get; }
+
+  public override void OnPurchase(IOnlinePlayer player) { }
+}

TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs

@@ -0,0 +1,108 @@
+using System.Drawing;
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI.Configs.Traitor;
+using ShopAPI.Events;
+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.Items.PoisonShots;
+
+public class PoisonShotsListener(IServiceProvider provider)
+  : BaseListener(provider) {
+  private readonly Dictionary<IPlayer, int> poisonShots = new();
+
+  private readonly PoisonShotsConfig config =
+    provider.GetRequiredService<PoisonShotsConfig>();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IScheduler scheduler =
+    provider.GetRequiredService<IScheduler>();
+
+  private readonly List<IDisposable> poisonTimers = [];
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnPurchase(PlayerPurchaseItemEvent ev) {
+    if (ev.Item is not PoisonShotsItem) return;
+    poisonShots.TryAdd(ev.Player, 0);
+    poisonShots[ev.Player] += config.TotalShots;
+  }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnFire(EventWeaponFire ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    var player = converter.GetPlayer(ev.Userid);
+    if (!poisonShots.TryGetValue(player, out var shot) || shot <= 0)
+      return HookResult.Continue;
+    Server.NextWorldUpdate(() => poisonShots[player]--);
+    return HookResult.Continue;
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnDamage(PlayerDamagedEvent ev) {
+    if (ev.Attacker == null) return;
+    if (!poisonShots.TryGetValue(ev.Attacker, out var shot) || shot <= 0)
+      return;
+    poisonShots[ev.Attacker]--;
+    addPoisonEffect(ev.Player);
+  }
+
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameEnd(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.FINISHED) return;
+
+    foreach (var timer in poisonTimers) timer.Dispose();
+    poisonTimers.Clear();
+  }
+
+  private void addPoisonEffect(IPlayer player) {
+    IDisposable? timer = null;
+
+    var effect = new PoisonEffect(player);
+    timer = scheduler.SchedulePeriodic(config.TimeBetweenDamage, () => {
+      // ReSharper disable once AccessToModifiedClosure
+      if (!tickPoison(effect)) timer?.Dispose();
+    });
+
+    poisonTimers.Add(timer);
+  }
+
+  private bool tickPoison(PoisonEffect effect) {
+    if (effect.Player is not IOnlinePlayer online) return false;
+    if (!online.IsAlive) return false;
+    online.Health -= config.DamagePerTick;
+    effect.Ticks++;
+    effect.DamageGiven += config.DamagePerTick;
+
+    var gamePlayer = converter.GetPlayer(online);
+    gamePlayer?.ColorScreen(Color.Purple, 0.2f, 0.3f);
+
+    return effect.DamageGiven < config.TotalDamage;
+  }
+
+  public override void Dispose() {
+    base.Dispose();
+    foreach (var timer in poisonTimers) timer.Dispose();
+  }
+
+  private class PoisonEffect(IPlayer player) {
+    public IPlayer Player { get; init; } = player;
+    public int Ticks { get; set; }
+    public int DamageGiven { get; set; }
+  }
+}

TTT/CS2/Items/Station/DamageStation.cs

@@ -0,0 +1,75 @@
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Role;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Station;
+
+public static class DamageStationCollection {
+  public static void AddDamageStation(this IServiceCollection collection) {
+    collection.AddModBehavior<DamageStation>();
+  }
+}
+
+public class DamageStation(IServiceProvider provider) : StationItem(provider,
+  provider.GetService<IStorage<DamageStationConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new DamageStationConfig()) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IPlayerFinder finder =
+    provider.GetRequiredService<IPlayerFinder>();
+
+  private readonly IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
+  public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HURT];
+
+  public override string Description
+    => Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
+
+  override protected void onInterval() {
+    var players = finder.GetOnline();
+    foreach (var (prop, info) in props) {
+      if (Math.Abs(info.HealthGiven) > Math.Abs(_Config.TotalHealthGiven)) {
+        props.Remove(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 })
+       .Select(t
+          => (t.ApiPlayer, Dist: t.Origin!.Distance(propPos), t.GamePlayer))
+       .Where(t => t.Dist <= _Config.MaxRange)
+       .ToList();
+
+      foreach (var (player, dist, gamePlayer) in playerDists) {
+        var healthScale = 1.0 - dist / _Config.MaxRange;
+        var damageAmount =
+          (int)Math.Floor(_Config.HealthIncrements * healthScale);
+        player.Health    += damageAmount;
+        info.HealthGiven += damageAmount;
+
+        gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
+      }
+    }
+  }
+}

TTT/CS2/Items/Station/HealthStation.cs

@@ -0,0 +1,58 @@
+using CounterStrikeSharp.API;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Detective;
+using TTT.API.Extensions;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+
+namespace TTT.CS2.Items.Station;
+
+public static class HealthStationCollection {
+  public static void AddHealthStation(this IServiceCollection collection) {
+    collection.AddModBehavior<HealthStation>();
+  }
+}
+
+public class HealthStation(IServiceProvider provider) : StationItem(provider,
+  provider.GetService<IStorage<HealthStationConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new HealthStationConfig()) {
+  public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HEALTH];
+
+  public override string Description
+    => Locale[StationMsgs.SHOP_ITEM_STATION_HEALTH_DESC];
+
+  override protected void onInterval() {
+    var players = Utilities.GetPlayers();
+    foreach (var (prop, info) in props) {
+      if (Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
+        props.Remove(prop);
+        continue;
+      }
+
+      var propPos = prop.AbsOrigin;
+      if (propPos == null) continue;
+
+      var playerDists = players
+       .Select(p => (Player: p, Pos: p.Pawn.Value?.AbsOrigin))
+       .Where(t => t is { Pos: not null, Player.Pawn.Value.Health: > 0 })
+       .Select(t => (t.Player, Dist: t.Pos!.Distance(propPos)))
+       .Where(t => t.Dist <= _Config.MaxRange)
+       .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;
+
+        player.ExecuteClientCommand("play " + _Config.UseSound);
+      }
+    }
+  }
+}

TTT/CS2/Items/Station/StationInfo.cs

@@ -0,0 +1,9 @@
+using CounterStrikeSharp.API.Core;
+
+namespace TTT.CS2.Items.Station;
+
+public class StationInfo(CPhysicsPropMultiplayer prop, int health) {
+  public readonly CPhysicsPropMultiplayer Prop = prop;
+  public int Health = health;
+  public int HealthGiven = 0;
+}

TTT/CS2/Items/Station/StationItem.cs

@@ -0,0 +1,141 @@
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+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 ShopAPI.Configs;
+using TTT.API;
+using TTT.API.Player;
+using TTT.CS2.Extensions;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.Station;
+
+public abstract class StationItem(IServiceProvider provider,
+  StationConfig config)
+  : RoleRestrictedItem<DetectiveRole>(provider), IPluginModule {
+  private static readonly long PROP_SIZE_SQUARED = 500;
+  protected readonly StationConfig _Config = config;
+
+  protected readonly IPlayerConverter<CCSPlayerController> Converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
+    new();
+
+  private readonly IScheduler scheduler =
+    provider.GetRequiredService<IScheduler>();
+
+  private IDisposable? intervalHandle;
+
+  public override ShopItemConfig Config => _Config;
+
+  public override void Start() {
+    base.Start();
+    intervalHandle = scheduler.SchedulePeriodic(_Config.HealthInterval,
+      () => Server.NextWorldUpdate(onInterval));
+  }
+
+  public void Start(BasePlugin? plugin) {
+    Start();
+    plugin
+    ?.RegisterListener<
+        CounterStrikeSharp.API.Core.Listeners.OnServerPrecacheResources>(m => {
+        m.AddResource("models/props/cs_office/microwave.vmdl");
+      });
+  }
+
+  public override void Dispose() {
+    base.Dispose();
+    intervalHandle?.Dispose();
+  }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnBulletImpact(EventBulletImpact ev, GameEventInfo info) {
+    var hitVec = new Vector(ev.X, ev.Y, ev.Z);
+
+    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 })
+     .OrderBy(t => t.Distance)
+     .FirstOrDefault();
+
+    if (nearest.Key == null || nearest.Value == null
+      || nearest.Distance > PROP_SIZE_SQUARED)
+      return HookResult.Continue;
+
+    var dmg = getBulletDamage(ev);
+    nearest.Value.Health -= dmg;
+
+    if (nearest.Value.Health <= 0) {
+      nearest.Key.AcceptInput("Kill");
+      props.Remove(nearest.Key);
+      return HookResult.Continue;
+    }
+
+    nearest.Key.SetColor(
+      _Config.GetColor(nearest.Value.Health / (float)_Config.StationHealth));
+    return HookResult.Continue;
+  }
+
+  private int getBulletDamage(EventBulletImpact ev) {
+    var user   = ev.Userid;
+    var weapon = user?.Pawn.Value?.WeaponServices?.ActiveWeapon.Value;
+    var dist =
+      (user?.Pawn.Value?.AbsOrigin?.Distance(new Vector(ev.X, ev.Y, ev.Z))
+        ?? null) ?? 1;
+    var distScale  = Math.Clamp(256 / dist, 0.1, 1);
+    var baseDamage = getBaseDamage(weapon?.DesignerName ?? "");
+    var total      = (int)(baseDamage * distScale);
+    return Math.Max(total, 1);
+  }
+
+  private int getBaseDamage(string designerWeapon) {
+    return designerWeapon switch {
+      "weapon_awp"                                 => 115,
+      "weapon_glock"                               => 8,
+      "weapon_usp_silencer"                        => 20,
+      "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,
+      _                                            => 5
+    };
+  }
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Server.NextWorldUpdate(() => {
+      var prop =
+        Utilities.CreateEntityByName<CPhysicsPropMultiplayer>(
+          "prop_physics_multiplayer");
+
+      if (prop == null) return;
+
+      props[prop] = new StationInfo(prop, _Config.StationHealth);
+
+      prop.SetModel("models/props/cs_office/microwave.vmdl");
+      prop.DispatchSpawn();
+
+      var gamePlayer = Converter.GetPlayer(player);
+      if (gamePlayer == null || !gamePlayer.Pawn.IsValid
+        || gamePlayer.Pawn.Value == null)
+        return;
+      var spawnPos = gamePlayer.Pawn.Value.AbsOrigin.Clone();
+      if (spawnPos != null && gamePlayer.PlayerPawn.Value != null) {
+        var forward = gamePlayer.PlayerPawn.Value.EyeAngles.ToForward();
+        forward.Z =  0;
+        spawnPos  += forward.Normalized() * 8;
+      }
+
+      prop.Teleport(spawnPos);
+    });
+  }
+
+  abstract protected void onInterval();
+}

TTT/CS2/Items/Station/StationMsgs.cs

@@ -0,0 +1,17 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.Station;
+
+public class StationMsgs {
+  public static IMsg SHOP_ITEM_STATION_HEALTH
+    => MsgFactory.Create(nameof(SHOP_ITEM_STATION_HEALTH));
+
+  public static IMsg SHOP_ITEM_STATION_HEALTH_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_STATION_HEALTH_DESC));
+
+  public static IMsg SHOP_ITEM_STATION_HURT
+    => MsgFactory.Create(nameof(SHOP_ITEM_STATION_HURT));
+
+  public static IMsg SHOP_ITEM_STATION_HURT_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_STATION_HURT_DESC));
+}

TTT/CS2/Listeners/BodyPickupListener.cs

@@ -1,14 +1,15 @@
 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.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;
 
@@ -25,6 +26,7 @@ public class BodyPickupListener(IServiceProvider provider)
   private readonly IAliveSpoofer? spoofer =
     provider.GetService<IAliveSpoofer>();
 
+  [UsedImplicitly]
   [EventHandler]
   public void OnPropPickup(PropPickupEvent ev) {
     if (!bodies.TryLookup(ev.Prop.Index.ToString(), out var body)) return;
@@ -35,10 +37,10 @@ public class BodyPickupListener(IServiceProvider provider)
     var identifyEvent = new BodyIdentifyEvent(body, online);
 
     Bus.Dispatch(identifyEvent);
-    if (identifyEvent.IsCanceled) return;
   }
 
-  [EventHandler]
+  [UsedImplicitly]
+  [EventHandler(IgnoreCanceled = true)]
   public void OnIdentify(BodyIdentifyEvent ev) {
     ev.Body.IsIdentified = true;
 

TTT/CS2/Listeners/PlayerStatsTracker.cs

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

TTT/CS2/Listeners/RoundTimerListener.cs

@@ -1,4 +1,5 @@
 using System.Drawing;
+using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
@@ -30,6 +31,11 @@ public class RoundTimerListener(IServiceProvider provider)
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly IScheduler scheduler = provider
+   .GetRequiredService<IScheduler>();
+
+  private IDisposable? endTimer;
+
   [UsedImplicitly]
   [EventHandler(IgnoreCanceled = true)]
   public void OnRoundStart(GameStateUpdateEvent ev) {
@@ -43,18 +49,27 @@ public class RoundTimerListener(IServiceProvider provider)
           player.Respawn();
 
         foreach (var player in Utilities.GetPlayers())
-          player.SetColor(Color.FromArgb(254, 255, 255, 255));
+          player.SetColor(Color.White);
       });
 
       return;
     }
 
+    if (ev.NewState == State.FINISHED) endTimer?.Dispose();
     if (ev.NewState != State.IN_PROGRESS) return;
+    var duration = config.RoundCfg.RoundDuration(ev.Game.Players.Count);
+    Messenger.DebugAnnounce("Total duration: {0} for {1} player", duration,
+      ev.Game.Players.Count);
     Server.NextWorldUpdate(() => {
-      RoundUtil.SetTimeRemaining((int)config.RoundCfg
-       .RoundDuration(ev.Game.Players.Count)
-       .TotalSeconds);
-      Server.ExecuteCommand("mp_ignore_round_win_conditions 0");
+      RoundUtil.SetTimeRemaining((int)duration.TotalSeconds);
+    });
+
+    endTimer?.Dispose();
+    endTimer = scheduler.Schedule(duration, () => {
+      Server.NextWorldUpdate(() => {
+        Messenger.DebugAnnounce("Time is up!");
+        ev.Game.EndGame(EndReason.TIMEOUT(new InnocentRole(provider)));
+      });
     });
   }
 
@@ -65,11 +80,6 @@ public class RoundTimerListener(IServiceProvider provider)
 
     revealRoles(ev.Game);
 
-    // If CS caused the round to end, we will have 0 time left
-    // in this case, CS automatically handles the end of round stuff
-    // so we don't need to do anything
-    if (RoundUtil.GetTimeRemaining() <= 1) return;
-
     Server.NextWorldUpdate(() => {
       var endReason = endRound(ev);
 
@@ -81,8 +91,11 @@ public class RoundTimerListener(IServiceProvider provider)
 
       var timer = Observable.Timer(
         config.RoundCfg.TimeBetweenRounds, Scheduler);
-      timer.Subscribe(_
-        => Server.NextWorldUpdate(() => RoundUtil.EndRound(endReason)));
+      timer.Subscribe(_ => Server.NextWorldUpdate(() => {
+        Server.ExecuteCommand("mp_ignore_round_win_conditions 1");
+        RoundUtil.EndRound(endReason);
+        Server.ExecuteCommand("mp_ignore_round_win_conditions 0");
+      }));
     });
   }
 
@@ -115,4 +128,10 @@ public class RoundTimerListener(IServiceProvider provider)
 
     new EventNextlevelChanged(true).FireEvent(false);
   }
+
+  public override void Dispose() {
+    base.Dispose();
+
+    endTimer?.Dispose();
+  }
 }

TTT/CS2/Listeners/ScreenColorApplier.cs

@@ -0,0 +1,27 @@
+using System.Drawing;
+using CounterStrikeSharp.API.Core;
+using Microsoft.Extensions.DependencyInjection;
+using TTT.API.Events;
+using TTT.API.Player;
+using TTT.CS2.Extensions;
+using TTT.CS2.Roles;
+using TTT.Game.Events.Player;
+using TTT.Game.Listeners;
+
+namespace TTT.CS2.Listeners;
+
+public class ScreenColorApplier(IServiceProvider provider)
+  : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  [EventHandler]
+  public void OnRoleAssign(PlayerRoleAssignEvent ev) {
+    if (ev.Role is SpectatorRole) return;
+
+    var player     = converter.GetPlayer(ev.Player);
+    var alphaColor = Color.FromArgb(64, ev.Role.Color);
+    if (player != null)
+      player.ColorScreen(alphaColor, 3, 1, PlayerExtensions.FadeFlags.FADE_OUT);
+  }
+}

TTT/CS2/Player/CCPlayerConverter.cs

@@ -8,6 +8,7 @@ namespace TTT.CS2.Player;
 public class CCPlayerConverter : IPluginModule,
   IPlayerConverter<CCSPlayerController> {
   private readonly Dictionary<string, CS2Player> playerCache = new();
+  private readonly Dictionary<string, CCSPlayerController> reverseCache = new();
 
   public IPlayer GetPlayer(CCSPlayerController player) {
     if (playerCache.TryGetValue(player.SteamID.ToString(),
@@ -28,12 +29,19 @@ public class CCPlayerConverter : IPluginModule,
 
   public CCSPlayerController? GetPlayer(IPlayer player) {
     if (!ulong.TryParse(player.Id, out var steamId)) return null;
+    if (reverseCache.TryGetValue(player.Id, out var cachedPlayer)) {
+      if (cachedPlayer.IsValid) return cachedPlayer;
+
+      reverseCache.Remove(player.Id);
+    }
+
     CCSPlayerController? result = null;
     var                  gamePlayer = Utilities.GetPlayerFromSteamId(steamId);
     if (gamePlayer is { IsValid: true }) result = gamePlayer;
 
     var bot = Utilities.GetPlayerFromIndex((int)steamId);
     if (bot is { IsValid: true }) result = bot;
+    if (result != null) reverseCache[player.Id] = result;
     return result;
   }
 

TTT/CS2/Player/CS2AliveSpoofer.cs

@@ -11,27 +11,25 @@ public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
 
   public void SpoofAlive(CCSPlayerController player) {
     if (player.IsBot) {
-      player.PawnIsAlive = true;
-      Utilities.SetStateChanged(player, "CCSPlayerController",
-        "m_bPawnIsAlive");
+      Server.NextWorldUpdate(() => {
+        var pawn = player.Pawn.Value;
+        if (pawn == null || !pawn.IsValid) return;
+        pawn.DeathTime = 0;
+        Utilities.SetStateChanged(pawn, "CBasePlayerPawn", "m_flDeathTime");
+        Utilities.SetStateChanged(pawn, "CBasePlayerController",
+          "m_flDeathTime");
+
+        Server.NextWorldUpdate(() => {
+          player.PawnIsAlive = true;
+          Utilities.SetStateChanged(player, "CCSPlayerController",
+            "m_bPawnIsAlive");
+        });
+      });
+
       return;
     }
 
     FakeAlivePlayers.Add(player);
-
-    Server.NextWorldUpdate(() => {
-      var pawn = player.Pawn.Value;
-      if (pawn == null || !pawn.IsValid) return;
-      pawn.DeathTime = 0;
-      Utilities.SetStateChanged(pawn, "CBasePlayerPawn", "m_flDeathTime");
-      Utilities.SetStateChanged(pawn, "CBasePlayerController", "m_flDeathTime");
-
-      Server.NextWorldUpdate(() => {
-        player.PawnIsAlive = true;
-        Utilities.SetStateChanged(player, "CCSPlayerController",
-          "m_bPawnIsAlive");
-      });
-    });
   }
 
   public void UnspoofAlive(CCSPlayerController player) {

TTT/CS2/Player/CS2InventoryManager.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
 using TTT.API;
 using TTT.API.Player;
 using TTT.CS2.Extensions;
@@ -8,24 +9,17 @@ namespace TTT.CS2.Player;
 
 public class CS2InventoryManager(
   IPlayerConverter<CCSPlayerController> converter) : IInventoryManager {
-  public void GiveWeapon(IOnlinePlayer player, IWeapon weapon) {
-    Server.NextWorldUpdate(() => {
+  public Task GiveWeapon(IOnlinePlayer player, IWeapon weapon) {
+    return Server.NextWorldUpdateAsync(() => {
       var gamePlayer = converter.GetPlayer(player);
       if (gamePlayer == null) return;
 
-      gamePlayer.GiveNamedItem(weapon.Id);
-      if (weapon.ReserveAmmo == null && weapon.CurrentAmmo == null) return;
-      var weaponBase = gamePlayer.GetWeaponBase(weapon.Id);
-      if (weaponBase == null) return;
-      if (weapon.CurrentAmmo != null)
-        weaponBase.Clip1 = weapon.CurrentAmmo.Value;
-      if (weapon.ReserveAmmo != null)
-        weaponBase.Clip2 = weapon.ReserveAmmo.Value;
+      giveWeapon(gamePlayer, weapon);
     });
   }
 
-  public void RemoveWeapon(IOnlinePlayer player, string weaponId) {
-    Server.NextWorldUpdate(() => {
+  public Task RemoveWeapon(IOnlinePlayer player, string weaponId) {
+    return Server.NextWorldUpdateAsync(() => {
       if (!player.IsAlive) return;
 
       var gamePlayer = converter.GetPlayer(player);
@@ -51,8 +45,19 @@ public class CS2InventoryManager(
     });
   }
 
-  public void RemoveAllWeapons(IOnlinePlayer player) {
-    Server.NextWorldUpdate(() => {
+  public Task RemoveWeaponInSlot(IOnlinePlayer player, int slot) {
+    return Server.NextWorldUpdateAsync(() => {
+      if (!player.IsAlive) return;
+
+      var gamePlayer = converter.GetPlayer(player);
+      if (gamePlayer == null) return;
+
+      clearSlot(gamePlayer, IntToSlot(slot));
+    });
+  }
+
+  public Task RemoveAllWeapons(IOnlinePlayer player) {
+    return Server.NextWorldUpdateAsync(() => {
       if (!player.IsAlive) return;
 
       var gamePlayer = converter.GetPlayer(player);
@@ -61,4 +66,69 @@ public class CS2InventoryManager(
       gamePlayer.RemoveWeapons();
     });
   }
+
+  private void giveWeapon(CCSPlayerController player, IWeapon weapon) {
+    if (player.Team is CsTeam.None or CsTeam.Spectator) return;
+
+    // Give the weapon
+    player.GiveNamedItem(weapon.WeaponId);
+
+    // Set ammo if applicable
+    var weaponBase = player.GetWeaponBase(weapon.WeaponId);
+    if (weaponBase == null)
+      if (weapon.WeaponId.Equals("weapon_revolver"))
+        weaponBase = player.GetWeaponBase("weapon_deagle");
+
+    if (weaponBase == null) return;
+
+    if (weapon.CurrentAmmo != null) weaponBase.Clip1 = weapon.CurrentAmmo.Value;
+    if (weapon.ReserveAmmo != null)
+      weaponBase.ReserveAmmo[0] = weapon.ReserveAmmo.Value;
+    Utilities.SetStateChanged(weaponBase, "CBasePlayerWeapon", "m_iClip1");
+    Utilities.SetStateChanged(weaponBase, "CBasePlayerWeapon",
+      "m_pReserveAmmo");
+  }
+
+  public static gear_slot_t IntToSlot(int slot) {
+    return slot switch {
+      0 => gear_slot_t.GEAR_SLOT_RIFLE,
+      1 => gear_slot_t.GEAR_SLOT_PISTOL,
+      2 => gear_slot_t.GEAR_SLOT_KNIFE,
+      3 => gear_slot_t.GEAR_SLOT_UTILITY,
+      4 => gear_slot_t.GEAR_SLOT_C4,
+      _ => gear_slot_t.GEAR_SLOT_FIRST
+    };
+  }
+
+  public static int SlotToInt(gear_slot_t slot) {
+    return slot switch {
+      gear_slot_t.GEAR_SLOT_RIFLE   => 0,
+      gear_slot_t.GEAR_SLOT_PISTOL  => 1,
+      gear_slot_t.GEAR_SLOT_KNIFE   => 2,
+      gear_slot_t.GEAR_SLOT_UTILITY => 3,
+      gear_slot_t.GEAR_SLOT_C4      => 4,
+      _                             => -1
+    };
+  }
+
+  private void clearSlot(CCSPlayerController player,
+    params gear_slot_t[] slots) {
+    if (player.Team is CsTeam.None or CsTeam.Spectator) return;
+    var weapons = player.Pawn.Value?.WeaponServices?.MyWeapons;
+    if (weapons == null || weapons.Count == 0) return;
+
+    foreach (var weapon in weapons) {
+      if (!weapon.IsValid || weapon.Value == null) continue;
+      if (!weapon.Value.IsValid
+        || !weapon.Value.DesignerName.StartsWith("weapon_"))
+        continue;
+      if (weapon.Value.Entity == null) continue;
+      var weaponBase = weapon.Value.As<CCSWeaponBase>();
+      if (!weaponBase.IsValid || weaponBase.Entity == null) continue;
+      var vdata = weaponBase.VData;
+      if (vdata == null) continue;
+      if (!slots.Contains(vdata.GearSlot)) continue;
+      weapon.Value.AddEntityIOEvent("Kill", weapon.Value);
+    }
+  }
 }

TTT/CS2/Player/CS2Player.cs

@@ -58,15 +58,18 @@ public class CS2Player : IOnlinePlayer {
     get => Player?.Pawn.Value != null ? Player.Pawn.Value.Health : 0;
 
     set {
-      if (Player?.Pawn.Value == null) return;
+      Server.NextWorldUpdate(() => {
+        if (Player?.Pawn.Value == null) return;
 
-      if (value <= 0) {
-        Player.CommitSuicide(false, true);
-        return;
-      }
+        if (value <= 0) {
+          Player.CommitSuicide(false, true);
+          return;
+        }
 
-      Player.Pawn.Value.Health = value;
-      Utilities.SetStateChanged(Player.Pawn.Value, "CBaseEntity", "m_iHealth");
+        Player.Pawn.Value.Health = value;
+        Utilities.SetStateChanged(Player.Pawn.Value, "CBaseEntity",
+          "m_iHealth");
+      });
     }
   }
 
@@ -109,15 +112,29 @@ public class CS2Player : IOnlinePlayer {
   // Goal: Pad the name to a fixed width for better alignment in logs
   // Left-align ID, right-align name
   private string createPaddedName() {
-    var idPart           = $"({getSuffix(Id, 5)})";
-    var effectivePadding = namePadding - idPart.Length;
-    var namePart = Name.Length >= effectivePadding ?
-      getSuffix(Name, effectivePadding) :
-      Name.PadLeft(effectivePadding);
-    return $"{idPart} {namePart}";
+    return CreatePaddedName(Id, Name, namePadding + 8);
   }
 
-  private string getSuffix(string s, int len) {
-    return s.Length <= len ? s : s[^len..];
+  public static string CreatePaddedName(string id, string name, int len) {
+    var suffix = id.Length > 5 ? id[^5..] : id.PadLeft(5, '0');
+    var prefix = $"({suffix})";
+
+    var baseStr = $"{prefix} {name}";
+
+    if (baseStr.Length == len) return baseStr;
+
+    if (baseStr.Length < len) {
+      // Pad spaces so the name ends up right-aligned
+      var padding = len - (prefix.Length + name.Length);
+      return prefix + new string(' ', padding + 1) + name;
+    }
+
+    // Too long, cut off from the end of the name
+    var availableForName                       = len - (prefix.Length + 1);
+    if (availableForName < 0) availableForName = 0;
+    var trimmedName = name.Length > availableForName ?
+      name[..availableForName] :
+      name;
+    return $"{prefix} {trimmedName}";
   }
 }

TTT/CS2/Utils/RoundUtil.cs

@@ -1,16 +1,16 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
-using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
+using CounterStrikeSharp.API.Modules.Memory;
 using CounterStrikeSharp.API.Modules.Utils;
 
 namespace TTT.CS2.Utils;
 
 public static class RoundUtil {
-  private static readonly
-    MemoryFunctionVoid<nint, float, RoundEndReason, nint, nint>
-    TerminateRoundFunc =
-      new(GameData.GetSignature("CCSGameRules_TerminateRound"));
+  // private static readonly
+  //   MemoryFunctionVoid<nint, float, RoundEndReason, nint, nint>
+  //   TerminateRoundFunc =
+  //     new(GameData.GetSignature("CCSGameRules_TerminateRound"));
 
   private static IEnumerable<CCSTeam>? _teamManager;
 
@@ -52,7 +52,9 @@ public static class RoundUtil {
     var gameRules = ServerUtil.GameRulesProxy;
     if (gameRules == null || gameRules.GameRules == null) return;
     // TODO: Figure out what these params do
-    TerminateRoundFunc.Invoke(gameRules.GameRules.Handle, 5f, reason, 0, 0);
+    // TerminateRoundFunc.Invoke(gameRules.GameRules.Handle, 5f, reason, 0, 0);
+    VirtualFunctions.TerminateRoundFunc.Invoke(gameRules.GameRules.Handle,
+      reason, 5f, 0, 0);
   }
 
   public static void SetTeamScore(CsTeam team, int score) {

TTT/CS2/lang/CS2Msgs.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.lang;

TTT/CS2/lang/en.yml

@@ -1,2 +1,24 @@
 ROLE_SPECTATOR: "Spectator"
-TASER_SCANNED: "%PREFIX%You scanned {0}{grey}, they are %an% {1}{grey}!"
+TASER_SCANNED: "%PREFIX%You scanned {0}{grey}, they are %an% {1}{grey}!"
+DNA_PREFIX: "{darkblue}D{blue}N{lightblue}A{grey} | {grey}"
+
+SHOP_ITEM_DNA: "DNA Scanner"
+SHOP_ITEM_DNA_DESC: "Scan bodies to reveal the person who killed them."
+SHOP_ITEM_DNA_SCANNED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, their killer was {red}{2}{grey}."
+SHOP_ITEM_DNA_SCANNED_OTHER: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, {2}."
+SHOP_ITEM_DNA_EXPIRED: "%DNA_PREFIX%You scanned {0}{1}'%s% {grey}body, but the DNA has expired."
+
+SHOP_ITEM_STATION_HEALTH: "Health Station"
+SHOP_ITEM_STATION_HEALTH_DESC: "A health station that heals players around it."
+SHOP_ITEM_STATION_HURT: "Hurt Station"
+SHOP_ITEM_STATION_HURT_DESC: "A station that hurts non-Traitors around it."
+
+SHOP_ITEM_CAMO: "Camouflage"
+SHOP_ITEM_CAMO_DESC: "Disguise yourself and make yourself harder to see."
+
+SHOP_ITEM_BODY_PAINT: "Body Paint"
+SHOP_ITEM_BODY_PAINT_DESC: "Paint bodies to make them appear identified."
+SHOP_ITEM_BODY_PAINT_OUT: "%PREFIX% You ran out of body paint."
+
+SHOP_ITEM_POISON_SHOTS: "Poison Shots"
+SHOP_ITEM_POISON_SHOTS_DESC: "Your bullets are coated in a mildly poisonous substance."

TTT/Game/Commands/CommandManager.cs

@@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Command;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Commands;

TTT/Game/Commands/LogsCommand.cs

@@ -11,7 +11,7 @@ public class LogsCommand(IServiceProvider provider) : ICommand {
 
   public void Dispose() { }
 
-  public string Name => "logs";
+  public string Id => "logs";
   public void Start() { }
 
   // TODO: Restrict and verbalize usage

TTT/Game/Commands/TTTCommand.cs

@@ -4,6 +4,7 @@ using TTT.API;
 using TTT.API.Command;
 using TTT.API.Events;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Commands;
@@ -13,7 +14,7 @@ public class TTTCommand(IServiceProvider provider) : ICommand {
     provider.GetRequiredService<IMsgLocalizer>();
 
   public void Dispose() { }
-  public string Name => "ttt";
+  public string Id => "ttt";
   public string[] Usage => ["<modules/commands/listeners>"];
 
   public void Start() { }
@@ -70,7 +71,7 @@ public class TTTCommand(IServiceProvider provider) : ICommand {
     IEnumerable<ITerrorModule> listeners) {
     foreach (var listener in listeners)
       printVersionedEntry(info, listener.Version,
-        listener.Name + " - " + listener.GetType().Name);
+        listener.Id + " - " + listener.GetType().Name);
   }
 
   private void printVersionedEntry(ICommandInfo info, string version,

TTT/Game/Events/Player/PlayerDamagedEvent.cs

@@ -80,6 +80,6 @@ public class PlayerDamagedEvent(IOnlinePlayer player, IOnlinePlayer? attacker,
     }
   }
 
-  public string? Weapon { get; private set; }
+  public string? Weapon { get; init; }
   public bool IsCanceled { get; set; }
 }

TTT/Game/IBody.cs

@@ -7,6 +7,7 @@ public interface IBody {
   IPlayer OfPlayer { get; }
   bool IsIdentified { get; set; }
   IWeapon? MurderWeapon { get; }
-  IPlayer? Killer { get; }
+  IPlayer? Killer { get; set; }
   string Id { get; }
+  DateTime TimeOfDeath { get; }
 }

TTT/Game/Listeners/Loggers/PlayerActionsLogger.cs

@@ -8,23 +8,26 @@ namespace TTT.Game.Listeners.Loggers;
 
 public class PlayerActionsLogger(IServiceProvider provider)
   : BaseListener(provider) {
-  [EventHandler]
+  // Needs to be higher so we detect the kill before the game ends
   [UsedImplicitly]
+  [EventHandler(Priority = Priority.HIGH)]
   public void OnPlayerKill(PlayerDeathEvent ev) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
     Games.ActiveGame.Logger.LogAction(new DeathAction(Provider, ev));
   }
 
+
+  [UsedImplicitly]
   [EventHandler]
   public void OnPlayerDamage(PlayerDamagedEvent ev) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
     Games.ActiveGame.Logger.LogAction(new DamagedAction(Provider, ev));
   }
 
+  [UsedImplicitly]
   [EventHandler]
   public void OnPlayerAssignedRole(PlayerRoleAssignEvent ev) {
-    if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
-    Games.ActiveGame.Logger.LogAction(
+    Games.ActiveGame?.Logger.LogAction(
       new RoleAssignedAction(ev.Player, ev.Role));
   }
 }

TTT/Game/Listeners/PlayerJoinStarting.cs

@@ -25,6 +25,9 @@ public class PlayerJoinStarting(IServiceProvider provider)
       $"There are {playerCount} Players online, starting the game...");
 
     var game = Games.CreateGame();
+
+    if (game == null)
+      Messenger.DebugAnnounce("Failed to create a new game instance.");
     game?.Start(config.RoundCfg.CountDownDuration);
   }
 }

TTT/Game/Loggers/SimpleLogger.cs

@@ -1,9 +1,9 @@
 using System.Reactive.Concurrency;
-using CounterStrikeSharp.API;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Game;
 using TTT.API.Messages;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Loggers;

TTT/Game/Roles/BaseRole.cs

@@ -4,6 +4,7 @@ using TTT.API.Messages;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.API.Storage;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Roles;

TTT/Game/Roles/BaseWeapon.cs

@@ -4,7 +4,7 @@ namespace TTT.Game.Roles;
 
 public class BaseWeapon(string id, int? reserve = null, int? current = null)
   : IWeapon {
-  public string Id { get; } = id;
+  public string WeaponId { get; } = id;
   public int? ReserveAmmo { get; } = reserve;
   public int? CurrentAmmo { get; } = current;
 }

TTT/Game/Roles/DetectiveRole.cs

@@ -1,5 +1,6 @@
 using System.Drawing;
 using TTT.API.Player;
+using TTT.Game.lang;
 
 namespace TTT.Game.Roles;
 

TTT/Game/Roles/InnocentRole.cs

@@ -1,6 +1,7 @@
 using System.Drawing;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Player;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Game.Roles;

TTT/Game/Roles/TraitorRole.cs

@@ -1,5 +1,6 @@
 using System.Drawing;
 using TTT.API.Player;
+using TTT.Game.lang;
 
 namespace TTT.Game.Roles;
 

TTT/Game/RoundBasedGame.cs

@@ -8,6 +8,7 @@ using TTT.API.Player;
 using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.Game.Events.Game;
+using TTT.Game.lang;
 using TTT.Game.Loggers;
 using TTT.Game.Roles;
 using TTT.Locale;
@@ -171,7 +172,6 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
       return;
     }
 
-    State = State.IN_PROGRESS;
 
     foreach (var player in online) inventory.RemoveAllWeapons(player);
 
@@ -179,6 +179,8 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
     RoleAssigner.AssignRoles(online, Roles);
     players.AddRange(online);
 
+    State = State.IN_PROGRESS;
+
     var traitors    = ((IGame)this).GetAlive(typeof(TraitorRole)).Count;
     var nonTraitors = online.Count - traitors;
     Messenger?.MessageAll(Locale[

TTT/Game/lang/GameMsgs.cs

@@ -4,7 +4,7 @@ using TTT.API.Role;
 using TTT.Game.Roles;
 using TTT.Locale;
 
-namespace TTT.Game;
+namespace TTT.Game.lang;
 
 public static class GameMsgs {
   public static IMsg PREFIX => MsgFactory.Create(nameof(PREFIX));

TTT/Karma/KarmaStorage.cs

@@ -42,7 +42,7 @@ public class KarmaStorage(IServiceProvider provider) : IKarmaService {
   }
 
   public void Dispose() { }
-  public string Name => nameof(KarmaStorage);
+  public string Id => nameof(KarmaStorage);
   public string Version => GitVersionInformation.FullSemVer;
 
   public async Task Write(IPlayer key, int newData) {

TTT/Plugin/TTT.cs

@@ -25,7 +25,7 @@ public class TTT(IServiceProvider provider) : BasePlugin {
       module.Start();
       loadedModules.Add(module);
       Logger.LogInformation(
-        $"Loaded {module.Version} {module.Name} {module.GetType().Namespace}");
+        $"Loaded {module.Version} {module.Id} {module.GetType().Namespace}");
     }
 
     var pluginModules = modules.Where(m => m is IPluginModule)
@@ -40,7 +40,7 @@ public class TTT(IServiceProvider provider) : BasePlugin {
       RegisterAllAttributes(module);
       loadedModules.Add(module);
       Logger.LogInformation(
-        $"Registered {module.Version} {module.Name} {module.GetType().Namespace}");
+        $"Registered {module.Version} {module.Id} {module.GetType().Namespace}");
     }
 
     Logger.LogInformation("All modules loaded successfully.");
@@ -54,10 +54,10 @@ public class TTT(IServiceProvider provider) : BasePlugin {
 
     foreach (var module in loadedModules)
       try {
-        Logger.LogInformation($"Unloading {module.Name} ({module.Version})");
+        Logger.LogInformation($"Unloading {module.Id} ({module.Version})");
         module.Dispose();
       } catch (Exception e) {
-        Logger.LogError(e, $"Error unloading module {module.Name}");
+        Logger.LogError(e, $"Error unloading module {module.Id}");
       }
 
     base.Dispose(disposing);

TTT/README.md

@@ -5,7 +5,7 @@ the subsidiary projects (i.e. not [Versioning](../Versioning)).
 
 # Structure
 ## [API](./API)
-The public API for TTT. Use this to add-on extra features, modules, roles, etc.
+The public API for TTT. Include this to add-on extra features, modules, roles, etc.
 
 ## [CS2](./CS2)
 A linker for CS2 to TTT. This adds support for CS2 to TTT.

TTT/Shop/Commands/BalanceCommand.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
 using TTT.API.Command;
 using TTT.API.Player;
 
@@ -6,8 +7,8 @@ namespace TTT.Shop.Commands;
 
 public class BalanceCommand(IServiceProvider provider) : ICommand {
   private readonly IShop shop = provider.GetRequiredService<IShop>();
-  public string Name => "balance";
-  public string[] Aliases => [Name, "bal", "credits", "money"];
+  public string Id => "balance";
+  public string[] Aliases => [Id, "bal", "credits", "money"];
 
   public void Dispose() { }
   public void Start() { }

TTT/Shop/Commands/BuyCommand.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
 using TTT.API.Command;
 using TTT.API.Game;
 using TTT.API.Player;
@@ -16,55 +17,43 @@ public class BuyCommand(IServiceProvider provider) : ICommand {
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
   public void Dispose() { }
-  public string Name => "buy";
+  public string Id => "buy";
   public void Start() { }
-  public string[] Aliases => [Name, "purchase", "b"];
+  public string[] Aliases => [Id, "purchase", "b"];
 
-  public async Task<CommandResult> Execute(IOnlinePlayer? executor,
+  public Task<CommandResult> Execute(IOnlinePlayer? executor,
     ICommandInfo info) {
-    if (executor == null) {
-      info.ReplySync("You must be a player to buy items.");
-      return CommandResult.PLAYER_ONLY;
-    }
+    if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
 
     if (games.ActiveGame is not { State: State.IN_PROGRESS }) {
       info.ReplySync(locale[ShopMsgs.SHOP_INACTIVE]);
-      return CommandResult.SUCCESS;
+      return Task.FromResult(CommandResult.SUCCESS);
     }
 
-    if (info.ArgCount == 1) return CommandResult.PRINT_USAGE;
+    if (info.ArgCount == 1) return Task.FromResult(CommandResult.PRINT_USAGE);
+
+    if (executor.Health <= 0) {
+      info.ReplySync(locale[ShopMsgs.SHOP_INACTIVE]);
+      return Task.FromResult(CommandResult.SUCCESS);
+    }
 
     var query = string.Join(" ", info.Args.Skip(1));
-    info.ReplySync($"Searching for item: {query}");
-
-    var item = searchItem(query);
+    var item  = searchItem(query);
 
     if (item == null) {
-      info.ReplySync($"Item '{query}' not found.");
-      return CommandResult.ERROR;
+      info.ReplySync(locale[ShopMsgs.SHOP_ITEM_NOT_FOUND(query)]);
+      return Task.FromResult(CommandResult.ERROR);
     }
 
-    var bal = await shop.Load(executor);
-    if (item.Config.Price > bal) {
-      info.ReplySync(
-        $"You cannot afford '{item.Name}'. It costs {item.Config.Price}, but you have {bal}.");
-      return CommandResult.ERROR;
-    }
-
-    if (item.CanPurchase(executor) != PurchaseResult.SUCCESS) {
-      info.ReplySync($"You cannot purchase '{item.Name}'.");
-      return CommandResult.ERROR;
-    }
-
-    await shop.Write(executor, bal - item.Config.Price);
-    item.OnPurchase(executor);
-    shop.GiveItem(executor, item);
-    return CommandResult.SUCCESS;
+    var result = shop.TryPurchase(executor, item);
+    return Task.FromResult(result == PurchaseResult.SUCCESS ?
+      CommandResult.SUCCESS :
+      CommandResult.ERROR);
   }
 
   private IShopItem? searchItem(string query) {
     var item = shop.Items.FirstOrDefault(it
-      => it.Id.Equals(query, StringComparison.OrdinalIgnoreCase));
+      => it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));
 
     if (item != null) return item;
 
@@ -74,7 +63,7 @@ public class BuyCommand(IServiceProvider provider) : ICommand {
     if (item != null) return item;
 
     item = shop.Items.FirstOrDefault(it
-      => it.Name.Contains(query, StringComparison.OrdinalIgnoreCase));
+      => it.Description.Contains(query, StringComparison.OrdinalIgnoreCase));
 
     return item;
   }

TTT/Shop/Commands/ListCommand.cs

@@ -1,4 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
 using TTT.API.Command;
 using TTT.API.Messages;
 using TTT.API.Player;
@@ -13,14 +15,15 @@ public class ListCommand(IServiceProvider provider) : ICommand {
 
   public void Dispose() { }
 
-  public string Name => "list";
+  public string Id => "list";
 
   public void Start() { }
 
   public Task<CommandResult>
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     foreach (var item in shop.Items)
-      messenger.Message(executor, $"{item.Name} - {item.Description}");
+      messenger.Message(executor,
+        $"{ChatColors.Grey}- {ChatColors.White}{item.Name} {ChatColors.Grey}- {item.Description}");
 
     return Task.FromResult(CommandResult.SUCCESS);
   }

TTT/Shop/Commands/ShopCommand.cs

@@ -2,7 +2,7 @@ using CounterStrikeSharp.API.Modules.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Command;
 using TTT.API.Player;
-using TTT.Game;
+using TTT.Game.lang;
 using TTT.Locale;
 
 namespace TTT.Shop.Commands;
@@ -18,7 +18,7 @@ public class ShopCommand(IServiceProvider provider) : ICommand {
   };
 
   public void Dispose() { }
-  public string Name => "shop";
+  public string Id => "shop";
 
   public void Start() { }
 
@@ -27,17 +27,17 @@ public class ShopCommand(IServiceProvider provider) : ICommand {
     HashSet<string> sent = [];
     if (info.ArgCount == 1) {
       foreach (var (_, cmd) in subcommands) {
-        if (!sent.Add(cmd.Name)) continue;
+        if (!sent.Add(cmd.Id)) continue;
         var uses = cmd.Usage.Where(use => !string.IsNullOrWhiteSpace(use))
          .ToList();
         var useString =
           uses.Count > 0 ? "(" + string.Join(", ", uses) + ")" : "";
         if (cmd.Description != null)
           info.ReplySync(
-            $"{locale[GameMsgs.PREFIX]}{ChatColors.White}{cmd.Name} {ChatColors.Grey}- {ChatColors.BlueGrey}{cmd.Description}");
+            $"{locale[GameMsgs.PREFIX]}{ChatColors.White}{cmd.Id} {ChatColors.Grey}- {ChatColors.BlueGrey}{cmd.Description}");
         else
           info.ReplySync(
-            $"{locale[GameMsgs.PREFIX]}{ChatColors.White}{cmd.Name} {ChatColors.Grey}{useString}");
+            $"{locale[GameMsgs.PREFIX]}{ChatColors.White}{cmd.Id} {ChatColors.Grey}{useString}");
       }
 
       return Task.FromResult(CommandResult.SUCCESS);

TTT/Shop/Items/Detective/Stickers/StickerListener.cs

@@ -0,0 +1,43 @@
+using CounterStrikeSharp.API.Core;
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.Game.Events.Player;
+using TTT.Game.Listeners;
+
+namespace TTT.Shop.Items.Detective.Stickers;
+
+public class StickerListener(IServiceProvider provider)
+  : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IIconManager? icons = provider.GetService<IIconManager>();
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  [UsedImplicitly]
+  [EventHandler(Priority = Priority.MONITOR)]
+  public void OnHurt(PlayerDamagedEvent ev) {
+    if (icons == null || ev.Attacker == null
+      || !shop.HasItem<Stickers>(ev.Attacker))
+      return;
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
+    if (ev.Weapon == null) return;
+    if (!ev.Weapon.Contains("taser", StringComparison.OrdinalIgnoreCase))
+      return;
+    if (!ev.IsCanceled) return;
+
+    var victim   = ev.Player;
+    var attacker = ev.Attacker;
+
+    if (attacker == null) return;
+
+    var player = converter.GetPlayer(victim);
+    if (player == null || !player.IsValid) return;
+    icons.RevealToAll(player.Slot);
+    Messenger.Message(victim, Locale[StickerMsgs.SHOP_ITEM_STICKERS_HIT]);
+  }
+}

TTT/Shop/Items/Detective/Stickers/StickerMsgs.cs

@@ -0,0 +1,14 @@
+using TTT.Locale;
+
+namespace TTT.Shop.Items.Detective.Stickers;
+
+public class StickerMsgs {
+  public static IMsg SHOP_ITEM_STICKERS
+    => MsgFactory.Create(nameof(SHOP_ITEM_STICKERS));
+
+  public static IMsg SHOP_ITEM_STICKERS_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_STICKERS_DESC));
+
+  public static IMsg SHOP_ITEM_STICKERS_HIT
+    => MsgFactory.Create(nameof(SHOP_ITEM_STICKERS_HIT));
+}

TTT/Shop/Items/Detective/Stickers/Stickers.cs

@@ -0,0 +1,42 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Detective;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.Shop.Items.Detective.Stickers;
+
+public static class StickerExtensions {
+  public static void AddStickerServices(this IServiceCollection services) {
+    services.AddModBehavior<Stickers>();
+    services.AddModBehavior<StickerListener>();
+  }
+}
+
+public class Stickers(IServiceProvider provider)
+  : RoleRestrictedItem<DetectiveRole>(provider) {
+  private readonly StickerConfig config = provider
+   .GetService<IStorage<StickerConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new StickerConfig();
+
+  private readonly IIconManager? icons = provider.GetService<IIconManager>();
+
+  public override string Name => Locale[StickerMsgs.SHOP_ITEM_STICKERS];
+
+  public override string Description
+    => Locale[StickerMsgs.SHOP_ITEM_STICKERS_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) { }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    if (Shop.HasItem(player, this)) return PurchaseResult.ALREADY_OWNED;
+    return base.CanPurchase(player);
+  }
+}

TTT/Shop/Items/M4A1/M4A1Msgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.Shop.Items.M4A1;
+
+public class M4A1Msgs {
+  public static IMsg SHOP_ITEM_M4A1
+    => MsgFactory.Create(nameof(SHOP_ITEM_M4A1));
+
+  public static IMsg SHOP_ITEM_M4A1_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_M4A1_DESC));
+}

TTT/Shop/Items/M4A1/M4A1ShopItem.cs

@@ -0,0 +1,40 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.Shop.Items.M4A1;
+
+public static class M4A1ServiceCollection {
+  public static void AddM4A1Services(this IServiceCollection collection) {
+    collection.AddModBehavior<M4A1ShopItem>();
+  }
+}
+
+public class M4A1ShopItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly M4A1Config config =
+    provider.GetService<IStorage<M4A1Config>>()?.Load().GetAwaiter().GetResult()
+    ?? new M4A1Config();
+
+  public override string Name => Locale[M4A1Msgs.SHOP_ITEM_M4A1];
+  public override string Description => Locale[M4A1Msgs.SHOP_ITEM_M4A1_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Task.Run(async () => {
+      foreach (var slot in config.ClearSlots)
+        await Inventory.RemoveWeaponInSlot(player, slot);
+
+      foreach (var weapon in config.Weapons)
+        await Inventory.GiveWeapon(player, new BaseWeapon(weapon));
+    });
+  }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return PurchaseResult.SUCCESS;
+  }
+}