Improve prop drag line appeareance (resolves #96)

```
Enhance poison effect management and resource disposal

- Improve resource management in `PoisonSmokeListener.cs` by ensuring proper disposal of poison smoke timers, clearing the timer list upon disposal, and ensuring termination of damage effects according to configuration settings. Remove unnecessary debug output for cleaner logs.
- Refactor `PoisonShotsListener.cs` to reset poison shot data and improve disposal logic. Enhance poison shot usage management and streamline game mechanics related to poison damage and effects, ensuring a more efficient game experience.
```

.github/workflows/release.yml

@@ -158,7 +158,7 @@ jobs:
 
           # 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, 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." \
+          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

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/>.

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/API/Command/ICommand.cs

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

TTT/API/Player/IPlayer.cs

@@ -1,6 +1,6 @@
 namespace TTT.API.Player;
 
-public interface IPlayer {
+public interface IPlayer : IEquatable<IPlayer> {
   /// <summary>
   ///   The unique identifier for the player, should
   ///   be unique across all players at all times.
@@ -8,4 +8,9 @@ public interface IPlayer {
   string Id { get; }
 
   string Name { get; }
+
+  bool IEquatable<IPlayer>.Equals(IPlayer? other) {
+    if (other is null) return false;
+    return Id == other.Id;
+  }
 }

TTT/CS2/CS2ServiceCollection.cs

@@ -34,6 +34,7 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<ICommandManager, CS2CommandManager>();
     collection.AddModBehavior<IAliveSpoofer, CS2AliveSpoofer>();
     collection.AddModBehavior<IIconManager, RoleIconsHandler>();
+    collection.AddModBehavior<NameDisplayer>();
 
     // Configs
     collection.AddModBehavior<IStorage<TTTConfig>, CS2GameConfig>();
@@ -42,6 +43,9 @@ public static class CS2ServiceCollection {
      .AddModBehavior<IStorage<OneShotDeagleConfig>, CS2OneShotDeagleConfig>();
     collection.AddModBehavior<IStorage<C4Config>, CS2C4Config>();
     collection.AddModBehavior<IStorage<M4A1Config>, CS2M4A1Config>();
+    collection.AddModBehavior<IStorage<TaserConfig>, CS2TaserConfig>();
+    collection
+     .AddModBehavior<IStorage<PoisonSmokeConfig>, CS2PoisonSmokeConfig>();
 
     // TTT - CS2 Specific optionals
     collection.AddScoped<ITextSpawner, TextSpawner>();
@@ -52,8 +56,8 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<DamageCanceler>();
     collection.AddModBehavior<PlayerConnectionsHandler>();
     collection.AddModBehavior<PropMover>();
-    // collection.AddModBehavior<RoundEnd_GameEndHandler>();
     collection.AddModBehavior<RoundStart_GameStartHandler>();
+    collection.AddModBehavior<BombPlantSuppressor>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();

TTT/CS2/Command/CS2CommandManager.cs

@@ -40,20 +40,44 @@ public class CS2CommandManager(IServiceProvider provider)
     var wrapper = executor == null ?
       null :
       converter.GetPlayer(executor) as IOnlinePlayer;
-    Task.Run(async () => {
-      try {
-        Console.WriteLine($"Processing command: {cs2Info.CommandString}");
-        return await ProcessCommand(cs2Info);
-      } catch (Exception e) {
-        var msg = e.Message;
-        cs2Info.ReplySync(Localizer[GameMsgs.GENERIC_ERROR(msg)]);
-        await Server.NextWorldUpdateAsync(() => {
+
+    if (cmdMap.TryGetValue(info.GetArg(0), out var command))
+      if (command.MustBeOnMainThread) {
+        processCommandSync(cs2Info, wrapper);
+        return;
+      }
+
+    Task.Run(async () => await processCommandAsync(cs2Info, wrapper));
+  }
+
+  private async Task<CommandResult> processCommandAsync(CS2CommandInfo cs2Info,
+    IOnlinePlayer? wrapper) {
+    try {
+      Console.WriteLine($"Processing command: {cs2Info.CommandString}");
+      return await ProcessCommand(cs2Info);
+    } catch (Exception e) {
+      var msg = e.Message;
+      cs2Info.ReplySync(Localizer[GameMsgs.GENERIC_ERROR(msg)]);
+      await Server.NextWorldUpdateAsync(() => {
+        Console.WriteLine(
+          $"Encountered an error when processing command: \"{cs2Info.CommandString}\" by {wrapper?.Id}");
+        Console.WriteLine(e);
+      });
+      return CommandResult.ERROR;
+    }
+  }
+
+  private void processCommandSync(CS2CommandInfo cs2Info,
+    IOnlinePlayer? wrapper) {
+    try { _ = ProcessCommand(cs2Info); } catch (Exception e) {
+      var msg = e.Message;
+      cs2Info.ReplySync(Localizer[GameMsgs.GENERIC_ERROR(msg)]);
+      Server.NextWorldUpdateAsync(() => {
           Console.WriteLine(
             $"Encountered an error when processing command: \"{cs2Info.CommandString}\" by {wrapper?.Id}");
           Console.WriteLine(e);
-        });
-        return CommandResult.ERROR;
-      }
-    });
+        })
+       .Wait();
+    }
   }
 }

TTT/CS2/Command/Test/GiveItemCommand.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using CounterStrikeSharp.API;
+using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using TTT.API.Command;
 using TTT.API.Player;
@@ -6,12 +7,16 @@ using TTT.API.Player;
 namespace TTT.CS2.Command.Test;
 
 public class GiveItemCommand(IServiceProvider provider) : ICommand {
+  private readonly IPlayerFinder finder =
+    provider.GetRequiredService<IPlayerFinder>();
+
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
   public void Dispose() { }
   public void Start() { }
 
   public string Id => "giveitem";
+  public string[] Usage => ["[item] <player>"];
 
   public Task<CommandResult>
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
@@ -19,15 +24,29 @@ public class GiveItemCommand(IServiceProvider provider) : ICommand {
 
     if (info.ArgCount == 1) return Task.FromResult(CommandResult.PRINT_USAGE);
 
-    var query = string.Join(" ", info.Args.Skip(1));
+    var query = info.Args[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}.");
+    var target = executor;
+
+    Server.NextWorldUpdateAsync(() => {
+      if (info.ArgCount == 3) {
+        var result = finder.GetPlayerByName(info.Args[2]);
+        if (result == null) {
+          info.ReplySync($"Player '{info.Args[2]}' not found.");
+          return;
+        }
+
+        target = result;
+      }
+
+      shop.GiveItem(target, item);
+      info.ReplySync($"Gave item '{item.Name}' to {target.Name}.");
+    });
     return Task.FromResult(CommandResult.SUCCESS);
   }
 

TTT/CS2/Configs/CS2TaserConfig.cs

@@ -0,0 +1,38 @@
+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;
+
+public class CS2TaserConfig : IStorage<TaserConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_taser_price", "Price of the Taser item", 120,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<string> CV_WEAPON = new(
+    "css_ttt_shop_taser_weapon", "Weapon entity name used for the Taser",
+    "weapon_taser", ConVarFlags.FCVAR_NONE,
+    new ItemValidator(allowMultiple: false));
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<TaserConfig?> Load() {
+    var cfg = new TaserConfig {
+      Price = CV_PRICE.Value, Weapon = CV_WEAPON.Value
+    };
+
+    return Task.FromResult<TaserConfig?>(cfg);
+  }
+}

TTT/CS2/Configs/ShopItems/CS2C4Config.cs

@@ -11,7 +11,7 @@ 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,
+    "Price of the C4 item", 130, ConVarFlags.FCVAR_NONE,
     new RangeValidator<int>(0, 10000));
 
   public static readonly FakeConVar<string> CV_WEAPON = new(

TTT/CS2/Configs/ShopItems/CS2M4A1Config.cs

@@ -21,7 +21,7 @@ public class CS2M4A1Config : IStorage<M4A1Config>, IPluginModule {
   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,
+    "weapon_m4a1_silencer,weapon_usp_silencer", ConVarFlags.FCVAR_NONE,
     new ItemValidator(allowMultiple: true));
 
   public void Dispose() { }

TTT/CS2/Configs/ShopItems/CS2OneShotDeagleConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2PoisonSmokeConfig.cs

@@ -0,0 +1,67 @@
+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 CS2PoisonSmokeConfig : IStorage<PoisonSmokeConfig>, IPluginModule {
+  public static readonly FakeConVar<int> CV_PRICE = new(
+    "css_ttt_shop_poisonsmoke_price", "Price of the Poison Smoke item", 45,
+    ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 10000));
+
+  public static readonly FakeConVar<string> CV_WEAPON = new(
+    "css_ttt_shop_poisonsmoke_weapon",
+    "Weapon entity name used for the Poison Smoke item", "weapon_smokegrenade",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: false));
+
+  // Poison effect sub-config
+  public static readonly FakeConVar<int> CV_POISON_TICK_DAMAGE = new(
+    "css_ttt_shop_poisonsmoke_poison_damage_per_tick",
+    "Damage dealt per poison tick", 15, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(1, 100));
+
+  public static readonly FakeConVar<int> CV_POISON_TOTAL_DAMAGE = new(
+    "css_ttt_shop_poisonsmoke_poison_total_damage",
+    "Total damage dealt over the poison duration", 500, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(1, 1000));
+
+  public static readonly FakeConVar<int> CV_POISON_TICK_INTERVAL = new(
+    "css_ttt_shop_poisonsmoke_poison_tick_interval",
+    "Milliseconds between each poison damage tick", 500, ConVarFlags.FCVAR_NONE,
+    new RangeValidator<int>(100, 10000));
+
+  public static readonly FakeConVar<string> CV_POISON_SOUND = new(
+    "css_ttt_shop_poisonsmoke_poison_sound",
+    "Sound played when poison deals damage",
+    "sounds/player/player_damagebody_03");
+
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    ArgumentNullException.ThrowIfNull(plugin, nameof(plugin));
+    plugin.RegisterFakeConVars(this);
+  }
+
+  public Task<PoisonSmokeConfig?> Load() {
+    var poison = new PoisonConfig {
+      TimeBetweenDamage =
+        TimeSpan.FromMilliseconds(CV_POISON_TICK_INTERVAL.Value),
+      DamagePerTick = CV_POISON_TICK_DAMAGE.Value,
+      TotalDamage   = CV_POISON_TOTAL_DAMAGE.Value,
+      PoisonSound   = CV_POISON_SOUND.Value
+    };
+
+    var cfg = new PoisonSmokeConfig {
+      Price = CV_PRICE.Value, Weapon = CV_WEAPON.Value, PoisonConfig = poison
+    };
+
+    return Task.FromResult<PoisonSmokeConfig?>(cfg);
+  }
+}

TTT/CS2/Extensions/PlayerExtensions.cs

@@ -61,6 +61,19 @@ public static class PlayerExtensions {
     pawn.SetColor(color);
   }
 
+  public static void SetArmor(this CCSPlayerController player, int armor,
+    bool withHelmet = false) {
+    if (!player.IsValid) return;
+    var pawn = player.PlayerPawn.Value;
+    if (pawn == null || !pawn.IsValid) return;
+    pawn.ArmorValue = armor;
+    if (withHelmet)
+      if (pawn.ItemServices != null)
+        new CCSPlayer_ItemServices(pawn.ItemServices.Handle).HasHelmet = true;
+
+    Utilities.SetStateChanged(pawn, "CCSPlayerPawn", "m_ArmorValue");
+  }
+
   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) {

TTT/CS2/GameHandlers/BombPlantSuppressor.cs

@@ -0,0 +1,20 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using JetBrains.Annotations;
+using TTT.API;
+
+namespace TTT.CS2.GameHandlers;
+
+public class BombPlantSuppressor : IPluginModule {
+  public void Dispose() { }
+
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin?.HookUserMessage(322, um => {
+      um.Recipients.Clear();
+      return HookResult.Handled;
+    });
+  }
+}

TTT/CS2/GameHandlers/CombatHandler.cs

@@ -62,6 +62,10 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
     }
 
     var killerStats = ev.Attacker?.ActionTrackingServices?.MatchStats;
+    ev.Attacker.ActionTrackingServices.NumRoundKills--;
+    Utilities.SetStateChanged(ev.Attacker,
+      "CCSPlayerController_ActionTrackingServices",
+      "m_pActionTrackingServices");
     if (killerStats == null) return;
     killerStats.Kills  -= 1;
     killerStats.Damage -= ev.DmgHealth;

TTT/CS2/GameHandlers/DamageCancelers/OutOfRoundCanceler.cs

@@ -1,4 +1,5 @@
-using TTT.API.Events;
+using JetBrains.Annotations;
+using TTT.API.Events;
 using TTT.API.Game;
 using TTT.CS2.Utils;
 using TTT.Game.Events.Player;
@@ -8,10 +9,11 @@ namespace TTT.CS2.GameHandlers.DamageCancelers;
 
 public class OutOfRoundCanceler(IServiceProvider provider)
   : BaseListener(provider) {
+  [UsedImplicitly]
   [EventHandler]
   public void OnHurt(PlayerDamagedEvent ev) {
     if (RoundUtil.IsWarmup()) return;
-    if (Games.ActiveGame is not { State: State.IN_PROGRESS })
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
       ev.IsCanceled = true;
   }
 }

TTT/CS2/GameHandlers/NameDisplayer.cs

@@ -0,0 +1,34 @@
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Timers;
+using TTT.API;
+using TTT.CS2.Extensions;
+using TTT.CS2.RayTrace.Class;
+using TTT.CS2.RayTrace.Enum;
+
+namespace TTT.CS2.GameHandlers;
+
+public class NameDisplayer : IPluginModule {
+  public void Dispose() { }
+  public void Start() { }
+
+  public void Start(BasePlugin? plugin) {
+    plugin?.AddTimer(0.25f, showNames, TimerFlags.REPEAT);
+  }
+
+  private void showNames() {
+    foreach (var player in Utilities.GetPlayers()) {
+      if (player.GetHealth() <= 0) continue;
+
+      var target = player.GetGameTraceByEyePosition(TraceMask.MaskSolid,
+        Contents.NoDraw, player);
+
+      if (target == null) continue;
+
+      if (!target.Value.HitPlayer(out var hit)) continue;
+      if (hit == null) continue;
+
+      player.PrintToCenterAlert($"{hit.PlayerName}");
+    }
+  }
+}

TTT/CS2/GameHandlers/PropMover.cs

@@ -187,12 +187,11 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
     targetVector.Z = Math.Max(targetVector.Z, playerOrigin.Z - 48);
 
     if (ent.AbsOrigin == null) return;
-    var lerpedVector = ent.AbsOrigin.Lerp(targetVector, 0.3f);
 
     if (info.Beam != null && info.Beam.IsValid) {
       info.Beam.AcceptInput("Kill");
       info.Beam = createBeam(playerOrigin.With(z: playerOrigin.Z - 16),
-        lerpedVector);
+        ent.AbsOrigin);
     }
 
     playersPressingE[player] = info;
@@ -201,9 +200,9 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
   private CEnvBeam? createBeam(Vector start, Vector end) {
     var beam = Utilities.CreateEntityByName<CEnvBeam>("env_beam");
     if (beam == null) return null;
-    beam.RenderMode = RenderMode_t.kRenderTransColor;
-    beam.Width      = 0.5f;
-    beam.Render     = Color.White;
+    beam.RenderMode = RenderMode_t.kRenderTransAlpha;
+    beam.Width      = 2.0f;
+    beam.Render     = Color.FromArgb(32, Color.White);
     beam.EndPos.X   = end.X;
     beam.EndPos.Y   = end.Y;
     beam.EndPos.Z   = end.Z;

TTT/CS2/GameHandlers/RoleIconsHandler.cs

@@ -27,8 +27,6 @@ public class RoleIconsHandler(IServiceProvider provider)
   private static readonly string T_MODEL =
     "characters/models/tm_phoenix/tm_phoenix.vmdl";
 
-  // private readonly IDictionary<int, IEnumerable<CPointWorldText>> icons =
-  //   new Dictionary<int, IEnumerable<CPointWorldText>>();
   private readonly IEnumerable<CPointWorldText>?[] icons =
     new IEnumerable<CPointWorldText>[64];
 
@@ -79,8 +77,10 @@ public class RoleIconsHandler(IServiceProvider provider)
     plugin
     ?.RegisterListener<CounterStrikeSharp.API.Core.Listeners.CheckTransmit>(
         onTransmit);
+    if (hotReload) OnRoundEnd(null!, null!);
   }
 
+  [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnRoundEnd(EventRoundStart _, GameEventInfo _1) {
     foreach (var text in Utilities
@@ -93,7 +93,7 @@ public class RoleIconsHandler(IServiceProvider provider)
   [UsedImplicitly]
   [EventHandler(IgnoreCanceled = true)]
   public void OnRoundStart(GameStateUpdateEvent ev) {
-    if (ev.NewState != State.IN_PROGRESS) return;
+    if (ev.NewState != State.FINISHED) return;
     for (var i = 0; i < icons.Length; i++) removeIcon(i);
     ClearAllVisibility();
     traitorsThisRound.Clear();
@@ -163,6 +163,7 @@ public class RoleIconsHandler(IServiceProvider provider)
     icons[player.Slot] = roleIcon;
   }
 
+  [UsedImplicitly]
   [EventHandler(Priority = Priority.MONITOR)]
   public void OnDeath(PlayerDeathEvent ev) {
     var gamePlayer = players.GetPlayer(ev.Victim);

TTT/CS2/Hats/TextSetting.cs

@@ -8,7 +8,7 @@ public class TextSetting {
   public float depthOffset = 0.0f;
   public bool enabled = true;
   public string fontName = "Arial";
-  public float fontSize = 50;
+  public float fontSize = 64;
   public bool fullbright = true;
 
   public PointWorldTextJustifyHorizontal_t horizontal =
@@ -23,5 +23,5 @@ public class TextSetting {
   public PointWorldTextJustifyVertical_t vertical =
     PointWorldTextJustifyVertical_t.POINT_WORLD_TEXT_JUSTIFY_VERTICAL_CENTER;
 
-  public float worldUnitsPerPx = 0.4f;
+  public float worldUnitsPerPx = 0.5f;
 }

TTT/CS2/Hats/TextSpawner.cs

@@ -72,7 +72,7 @@ public class TextSpawner : ITextSpawner {
     position.Add(new Vector(0, 0, 72));
     rotation = new QAngle(rotation.X, rotation.Y + yRot, rotation.Z + 90);
 
-    position.Add(rotation.ToRight() * -10);
+    position.Add(rotation.ToRight() * 5);
 
     var ent = CreateText(setting, position, rotation);
     ent.AcceptInput("SetParent", player.Pawn.Value, null, "!activator");

TTT/CS2/Items/Armor/ArmorItem.cs

@@ -0,0 +1,42 @@
+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.Armor;
+
+public static class ArmorItemServicesCollection {
+  public static void AddArmorServices(this IServiceCollection collection) {
+    collection.AddModBehavior<ArmorItem>();
+  }
+}
+
+public class ArmorItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly ArmorConfig config = provider
+   .GetService<IStorage<ArmorConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new ArmorConfig();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public override string Name => Locale[ArmorMsgs.SHOP_ITEM_ARMOR];
+  public override string Description => Locale[ArmorMsgs.SHOP_ITEM_ARMOR_DESC];
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    var gamePlayer = converter.GetPlayer(player);
+    if (gamePlayer == null) return;
+
+    gamePlayer.SetArmor(config.Armor, config.Helmet);
+  }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return PurchaseResult.SUCCESS;
+  }
+}

TTT/CS2/Items/Armor/ArmorMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.Armor;
+
+public class ArmorMsgs {
+  public static IMsg SHOP_ITEM_ARMOR
+    => MsgFactory.Create(nameof(SHOP_ITEM_ARMOR));
+
+  public static IMsg SHOP_ITEM_ARMOR_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_ARMOR_DESC));
+}

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,55 @@
+using JetBrains.Annotations;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+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 IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
+  private readonly BodyPaintConfig config =
+    provider.GetService<IStorage<BodyPaintConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new BodyPaintConfig();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  private readonly Dictionary<IPlayer, int> uses = new();
+
+  [UsedImplicitly]
+  [EventHandler(Priority = Priority.HIGH)]
+  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.ContainsKey(player)) {
+      if (!shop.HasItem<BodyPaintItem>(online)) return false;
+      uses[player] = config.MaxUses;
+    }
+
+    if (uses[player] <= 0) return false;
+    uses[player]--;
+    if (uses[player] > 0) return true;
+    shop.RemoveItem<BodyPaintItem>(online);
+    Messenger.Message(online, Locale[BodyPaintMsgs.SHOP_ITEM_BODY_PAINT_OUT]);
+    uses.Remove(player);
+    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/DNA/DnaListener.cs

@@ -1,7 +1,7 @@
 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;

TTT/CS2/Items/DNA/DnaScanner.cs

@@ -1,6 +1,7 @@
 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;

TTT/CS2/Items/PoisonShots/PoisonShotMsgs.cs

@@ -0,0 +1,19 @@
+using TTT.API.Player;
+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));
+
+  public static IMsg SHOP_ITEM_POISON_OUT
+    => MsgFactory.Create(nameof(SHOP_ITEM_POISON_OUT));
+
+  public static IMsg SHOP_ITEM_POISON_HIT(IPlayer player) {
+    return MsgFactory.Create(nameof(SHOP_ITEM_POISON_HIT), player.Name);
+  }
+}

TTT/CS2/Items/PoisonShots/PoisonShotsItem.cs

@@ -0,0 +1,35 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.PoisonShots;
+
+public static class PoisonShotServiceCollection {
+  public static void AddPoisonShots(this IServiceCollection services) {
+    services.AddModBehavior<PoisonShotsItem>();
+    services.AddModBehavior<PoisonShotsListener>();
+  }
+}
+
+public class PoisonShotsItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  private readonly PoisonShotsConfig config = provider
+   .GetService<IStorage<PoisonShotsConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new PoisonShotsConfig();
+
+  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 => config;
+
+  public override void OnPurchase(IOnlinePlayer player) { }
+}

TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs

@@ -0,0 +1,138 @@
+using System.Diagnostics.CodeAnalysis;
+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;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.CS2.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), IPluginModule {
+  private readonly PoisonShotsConfig config =
+    provider.GetService<IStorage<PoisonShotsConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonShotsConfig();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly Dictionary<IPlayer, int> poisonShots = new();
+
+  private readonly List<IDisposable> poisonTimers = [];
+
+  private readonly IScheduler scheduler =
+    provider.GetRequiredService<IScheduler>();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  public override void Dispose() {
+    base.Dispose();
+    foreach (var timer in poisonTimers) timer.Dispose();
+  }
+
+  [UsedImplicitly]
+  [GameEventHandler]
+  public HookResult OnFire(EventWeaponFire ev, GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    if (!Tag.GUNS.Contains(ev.Weapon)) return HookResult.Continue;
+    if (converter.GetPlayer(ev.Userid) is not IOnlinePlayer player)
+      return HookResult.Continue;
+    var remainingShots = usePoisonShot(player);
+    if (remainingShots == 0)
+      Messenger.Message(player, Locale[PoisonShotMsgs.SHOP_ITEM_POISON_OUT]);
+
+    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;
+    Messenger.Message(ev.Attacker,
+      Locale[PoisonShotMsgs.SHOP_ITEM_POISON_HIT(ev.Player)]);
+    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();
+    poisonShots.Clear();
+  }
+
+  [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
+  private void addPoisonEffect(IPlayer player) {
+    IDisposable? timer = null;
+
+    var effect = new PoisonEffect(player);
+    timer = scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
+      => {
+      Server.NextWorldUpdate(() => {
+        if (tickPoison(effect) || timer == null) return;
+        timer.Dispose();
+        poisonTimers.Remove(timer);
+      });
+    });
+
+    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.PoisonConfig.DamagePerTick;
+    effect.Ticks++;
+    effect.DamageGiven += config.PoisonConfig.DamagePerTick;
+
+    var gamePlayer = converter.GetPlayer(online);
+    gamePlayer?.ColorScreen(config.PoisonColor, 0.2f, 0.3f);
+    gamePlayer?.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
+
+    return effect.DamageGiven < config.PoisonConfig.TotalDamage;
+  }
+
+  /// <summary>
+  ///   Uses a poison shot for the player. Returns the remaining shots, -1 if none
+  ///   are available.
+  /// </summary>
+  /// <param name="player"></param>
+  /// <returns></returns>
+  private int usePoisonShot(IOnlinePlayer player) {
+    if (!poisonShots.TryGetValue(player, out var shot) || shot <= 0) {
+      if (!shop.HasItem<PoisonShotsItem>(player)) return -1;
+      poisonShots[player] = config.TotalShots;
+    }
+
+    poisonShots[player]--;
+    if (poisonShots[player] > 0) return poisonShots[player];
+
+    poisonShots.Remove(player);
+    shop.RemoveItem<PoisonShotsItem>(player);
+    return 0;
+  }
+
+  private class PoisonEffect(IPlayer player) {
+    public IPlayer Player { get; } = player;
+    public int Ticks { get; set; }
+    public int DamageGiven { get; set; }
+  }
+}

TTT/CS2/Items/PoisonSmoke/PoisonSmokeItem.cs

@@ -0,0 +1,43 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.PoisonSmoke;
+
+public static class PoisonSmokeServiceCollection {
+  public static void AddPoisonSmoke(this IServiceCollection services) {
+    services.AddModBehavior<PoisonSmokeItem>();
+    services.AddModBehavior<PoisonSmokeListener>();
+  }
+}
+
+public class PoisonSmokeItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  private readonly PoisonSmokeConfig config =
+    provider.GetService<IStorage<PoisonSmokeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonSmokeConfig();
+
+  public override string Name => Locale[PoisonSmokeMsgs.SHOP_ITEM_POISON_SMOKE];
+
+  public override string Description
+    => Locale[PoisonSmokeMsgs.SHOP_ITEM_POISON_SMOKE_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Inventory.GiveWeapon(player, new BaseWeapon(config.Weapon));
+  }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return Shop.HasItem<PoisonSmokeItem>(player) ?
+      PurchaseResult.ALREADY_OWNED :
+      base.CanPurchase(player);
+  }
+}

TTT/CS2/Items/PoisonSmoke/PoisonSmokeListener.cs

@@ -0,0 +1,120 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core.Attributes.Registration;
+using CounterStrikeSharp.API.Modules.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs.Traitor;
+using TTT.API;
+using TTT.API.Messages;
+using TTT.API.Player;
+using TTT.API.Role;
+using TTT.API.Storage;
+using TTT.CS2.Extensions;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.PoisonSmoke;
+
+public class PoisonSmokeListener(IServiceProvider provider) : IPluginModule {
+  private readonly PoisonSmokeConfig config =
+    provider.GetService<IStorage<PoisonSmokeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonSmokeConfig();
+
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IPlayerFinder finder =
+    provider.GetRequiredService<IPlayerFinder>();
+
+  private readonly IMessenger messenger =
+    provider.GetRequiredService<IMessenger>();
+
+  private readonly List<IDisposable> poisonSmokes = [];
+
+  private readonly IRoleAssigner roleAssigner =
+    provider.GetRequiredService<IRoleAssigner>();
+
+  private readonly IScheduler scheduler =
+    provider.GetRequiredService<IScheduler>();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  public void Dispose() {
+    foreach (var timer in poisonSmokes) timer.Dispose();
+
+    poisonSmokes.Clear();
+  }
+
+  public void Start() { }
+
+  [GameEventHandler]
+  public HookResult OnSmokeGrenade(EventSmokegrenadeDetonate ev,
+    GameEventInfo _) {
+    if (ev.Userid == null) return HookResult.Continue;
+    var player = converter.GetPlayer(ev.Userid) as IOnlinePlayer;
+    if (player == null) return HookResult.Continue;
+    if (!shop.HasItem<PoisonSmokeItem>(player)) return HookResult.Continue;
+
+    shop.RemoveItem<PoisonSmokeItem>(player);
+
+    var projectile =
+      Utilities.GetEntityFromIndex<CSmokeGrenadeProjectile>(ev.Entityid);
+    if (projectile == null || !projectile.IsValid) return HookResult.Continue;
+    startPoisonEffect(projectile);
+    return HookResult.Continue;
+  }
+
+  [SuppressMessage("ReSharper", "AccessToModifiedClosure")]
+  private void startPoisonEffect(CSmokeGrenadeProjectile projectile) {
+    IDisposable? timer = null;
+
+    var effect = new PoisonEffect(projectile);
+
+    timer = scheduler.SchedulePeriodic(config.PoisonConfig.TimeBetweenDamage, ()
+      => {
+      Server.NextWorldUpdate(() => {
+        if (tickPoisonEffect(effect) || timer == null) return;
+        timer.Dispose();
+        poisonSmokes.Remove(timer);
+      });
+    });
+
+    poisonSmokes.Add(timer);
+  }
+
+  private bool tickPoisonEffect(PoisonEffect effect) {
+    if (!effect.Projectile.IsValid) return false;
+    effect.Ticks++;
+
+    var players = finder.GetOnline()
+     .Where(player => player.IsAlive && roleAssigner.GetRoles(player)
+       .Any(role => role is InnocentRole or DetectiveRole));
+
+    var gamePlayers = players.Select(p => converter.GetPlayer(p))
+     .Where(p => p != null && p.Pawn.Value != null && p.Pawn.Value.IsValid)
+     .Select(p => (p!, p?.Pawn.Value?.AbsOrigin.Clone()!));
+
+    gamePlayers = gamePlayers.Where(t
+      => t.Item2.Distance(effect.Origin) <= config.SmokeRadius);
+
+    foreach (var player in gamePlayers.Select(p => p.Item1)) {
+      if (effect.DamageGiven >= config.PoisonConfig.TotalDamage) continue;
+      player.AddHealth(-config.PoisonConfig.DamagePerTick);
+      player.ExecuteClientCommand("play " + config.PoisonConfig.PoisonSound);
+      effect.DamageGiven += config.PoisonConfig.DamagePerTick;
+    }
+
+    return effect.DamageGiven < config.PoisonConfig.TotalDamage;
+  }
+
+  private class PoisonEffect(CSmokeGrenadeProjectile projectile) {
+    public int Ticks { get; set; }
+    public int DamageGiven { get; set; }
+    public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
+    public CSmokeGrenadeProjectile Projectile { get; } = projectile;
+  }
+}

TTT/CS2/Items/PoisonSmoke/PoisonSmokeMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.CS2.Items.PoisonSmoke;
+
+public class PoisonSmokeMsgs {
+  public static IMsg SHOP_ITEM_POISON_SMOKE
+    => MsgFactory.Create(nameof(SHOP_ITEM_POISON_SMOKE));
+
+  public static IMsg SHOP_ITEM_POISON_SMOKE_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_POISON_SMOKE_DESC));
+}

TTT/CS2/Items/Station/DamageStation.cs

@@ -1,6 +1,6 @@
 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;
@@ -16,11 +16,12 @@ public static class DamageStationCollection {
   }
 }
 
-public class DamageStation(IServiceProvider provider) : StationItem(provider,
-  provider.GetService<IStorage<DamageStationConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new DamageStationConfig()) {
+public class DamageStation(IServiceProvider provider)
+  : StationItem<TraitorRole>(provider,
+    provider.GetService<IStorage<DamageStationConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new DamageStationConfig()) {
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
@@ -36,10 +37,12 @@ public class DamageStation(IServiceProvider provider) : StationItem(provider,
     => Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
 
   override protected void onInterval() {
-    var players = finder.GetOnline();
+    var players  = finder.GetOnline();
+    var toRemove = new List<CPhysicsPropMultiplayer>();
     foreach (var (prop, info) in props) {
-      if (Math.Abs(info.HealthGiven) > Math.Abs(_Config.TotalHealthGiven)) {
-        props.Remove(prop);
+      if (_Config.TotalHealthGiven != 0 && Math.Abs(info.HealthGiven)
+        > Math.Abs(_Config.TotalHealthGiven)) {
+        toRemove.Add(prop);
         continue;
       }
 
@@ -70,5 +73,7 @@ public class DamageStation(IServiceProvider provider) : StationItem(provider,
         gamePlayer.ExecuteClientCommand("play " + _Config.UseSound);
       }
     }
+
+    foreach (var prop in toRemove) props.Remove(prop);
   }
 }

TTT/CS2/Items/Station/HealthStation.cs

@@ -1,9 +1,11 @@
 using CounterStrikeSharp.API;
+using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
-using ShopAPI.Configs;
+using ShopAPI.Configs.Detective;
 using TTT.API.Extensions;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
+using TTT.Game.Roles;
 
 namespace TTT.CS2.Items.Station;
 
@@ -13,21 +15,24 @@ public static class HealthStationCollection {
   }
 }
 
-public class HealthStation(IServiceProvider provider) : StationItem(provider,
-  provider.GetService<IStorage<HealthStationConfig>>()
-  ?.Load()
-   .GetAwaiter()
-   .GetResult() ?? new HealthStationConfig()) {
+public class HealthStation(IServiceProvider provider)
+  : StationItem<DetectiveRole>(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();
+    var players  = Utilities.GetPlayers();
+    var toRemove = new List<CPhysicsPropMultiplayer>();
     foreach (var (prop, info) in props) {
-      if (Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
-        props.Remove(prop);
+      if (_Config.TotalHealthGiven != 0
+        && Math.Abs(info.HealthGiven) > _Config.TotalHealthGiven) {
+        toRemove.Add(prop);
         continue;
       }
 
@@ -53,5 +58,7 @@ public class HealthStation(IServiceProvider provider) : StationItem(provider,
         player.ExecuteClientCommand("play " + _Config.UseSound);
       }
     }
+
+    foreach (var prop in toRemove) props.Remove(prop);
   }
 }

TTT/CS2/Items/Station/StationItem.cs

@@ -9,14 +9,14 @@ using ShopAPI;
 using ShopAPI.Configs;
 using TTT.API;
 using TTT.API.Player;
+using TTT.API.Role;
 using TTT.CS2.Extensions;
-using TTT.Game.Roles;
 
 namespace TTT.CS2.Items.Station;
 
-public abstract class StationItem(IServiceProvider provider,
+public abstract class StationItem<T>(IServiceProvider provider,
   StationConfig config)
-  : RoleRestrictedItem<DetectiveRole>(provider), IPluginModule {
+  : RoleRestrictedItem<T>(provider), IPluginModule where T : IRole {
   private static readonly long PROP_SIZE_SQUARED = 500;
   protected readonly StationConfig _Config = config;
 

TTT/CS2/Listeners/RoundTimerListener.cs

@@ -58,19 +58,15 @@ public class RoundTimerListener(IServiceProvider provider)
     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)duration.TotalSeconds);
-    });
+    Server.NextWorldUpdate(()
+      => 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)));
+    endTimer = scheduler.Schedule(duration,
+      () => {
+        Server.NextWorldUpdate(()
+          => ev.Game.EndGame(EndReason.TIMEOUT(new InnocentRole(Provider))));
       });
-    });
   }
 
   [UsedImplicitly]

TTT/CS2/Player/CS2Player.cs

@@ -10,7 +10,7 @@ namespace TTT.CS2.Player;
 ///   Non-human Players (bots) will be tracked by their entity index.
 ///   Note that slot numbers are not guaranteed to be stable across server restarts.
 /// </summary>
-public class CS2Player : IOnlinePlayer {
+public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
   private CCSPlayerController? cachePlayer;
 
   protected CS2Player(string id, string name) {
@@ -51,6 +51,11 @@ public class CS2Player : IOnlinePlayer {
     => Math.Min(Utilities.GetPlayers().Select(p => p.PlayerName.Length).Max(),
       24);
 
+  public bool Equals(CS2Player? other) {
+    if (other is null) return false;
+    return Id == other.Id;
+  }
+
   public string Id { get; }
   public string Name { get; }
 
@@ -107,6 +112,8 @@ public class CS2Player : IOnlinePlayer {
     return player.SteamID.ToString();
   }
 
+  public override int GetHashCode() { return Id.GetHashCode(); }
+
   public override string ToString() { return createPaddedName(); }
 
   // Goal: Pad the name to a fixed width for better alignment in logs

TTT/CS2/lang/en.yml

@@ -14,4 +14,19 @@ 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_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."
+SHOP_ITEM_POISON_HIT: "%PREFIX% You hit {green}{0}{grey} with a {lightpurple}poison shot{grey}."
+SHOP_ITEM_POISON_OUT: "%PREFIX% You are out of poison shots."
+
+SHOP_ITEM_POISON_SMOKE: "Poison Smoke"
+SHOP_ITEM_POISON_SMOKE_DESC: "Throw a grenade that releases poisonous gas."
+
+SHOP_ITEM_ARMOR: "Armor with Helmet"
+SHOP_ITEM_ARMOR_DESC: "Wear armor that reduces incoming damage."

TTT/Game/GameServiceCollection.cs

@@ -20,6 +20,8 @@ public static class GameServiceCollection {
     collection.AddModBehavior<PlayerJoinStarting>();
     collection.AddModBehavior<PlayerActionsLogger>();
     collection.AddModBehavior<BodyIdentifyLogger>();
+    collection.AddModBehavior<PlayerDeathInformer>();
+    collection.AddModBehavior<TraitorBuddyInformer>();
 
     // Commands
     collection.AddModBehavior<TTTCommand>();

TTT/Game/Listeners/PlayerDeathInformer.cs

@@ -0,0 +1,19 @@
+using JetBrains.Annotations;
+using TTT.API.Events;
+using TTT.Game.Events.Player;
+using TTT.Game.lang;
+
+namespace TTT.Game.Listeners;
+
+public class PlayerDeathInformer(IServiceProvider provider)
+  : BaseListener(provider) {
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnDeath(PlayerDeathEvent ev) {
+    if (ev.Killer == null) return;
+    var killerRole = Roles.GetRoles(ev.Killer).FirstOrDefault();
+    if (killerRole == null) return;
+    Messenger.Message(ev.Victim,
+      Locale[GameMsgs.ROLE_REVEAL_DEATH(killerRole)]);
+  }
+}

TTT/Game/Listeners/TraitorBuddyInformer.cs

@@ -0,0 +1,33 @@
+using CounterStrikeSharp.API.Modules.Utils;
+using JetBrains.Annotations;
+using TTT.API.Events;
+using TTT.API.Game;
+using TTT.Game.Events.Game;
+using TTT.Game.lang;
+using TTT.Game.Roles;
+
+namespace TTT.Game.Listeners;
+
+public class TraitorBuddyInformer(IServiceProvider provider)
+  : BaseListener(provider) {
+  [UsedImplicitly]
+  [EventHandler]
+  public void OnGameStatChange(GameStateUpdateEvent ev) {
+    if (ev.NewState != State.IN_PROGRESS) return;
+
+    var traitors = ev.Game.GetAlive(typeof(TraitorRole));
+
+    foreach (var traitor in traitors) {
+      var buddies = traitors.Where(x => x != traitor).ToList();
+      if (buddies.Count == 0) {
+        Messenger.Message(traitor, Locale[GameMsgs.ROLE_REVEAL_TRAITORS_NONE]);
+      } else {
+        Messenger.Message(traitor,
+          Locale[GameMsgs.ROLE_REVEAL_TRAITORS_HEADER]);
+        foreach (var buddy in buddies)
+          Messenger.Message(traitor,
+            $" {ChatColors.Grey}- {ChatColors.Red}{buddy.Name}");
+      }
+    }
+  }
+}

TTT/Game/RoundBasedGame.cs

@@ -172,9 +172,6 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
       return;
     }
 
-
-    foreach (var player in online) inventory.RemoveAllWeapons(player);
-
     StartedAt = DateTime.Now;
     RoleAssigner.AssignRoles(online, Roles);
     players.AddRange(online);

TTT/Game/TTTConfig.cs

@@ -32,7 +32,7 @@ public record TTTConfig {
 
     public string[]? InnocentWeapons { get; init; } = ["knife", "pistol"];
 
-    public bool StripWeaponsPriorToEquipping { get; init; } = true;
+    public bool StripWeaponsPriorToEquipping { get; init; } = false;
   }
 
   public record RoundConfig {

TTT/Game/lang/GameMsgs.cs

@@ -15,12 +15,23 @@ public static class GameMsgs {
   public static IMsg ROLE_DETECTIVE
     => MsgFactory.Create(nameof(ROLE_DETECTIVE));
 
+  public static IMsg ROLE_REVEAL_TRAITORS_HEADER
+    => MsgFactory.Create(nameof(ROLE_REVEAL_TRAITORS_HEADER));
+
+  public static IMsg ROLE_REVEAL_TRAITORS_NONE
+    => MsgFactory.Create(nameof(ROLE_REVEAL_TRAITORS_NONE));
+
   public static IMsg GAME_LOGS_HEADER
     => MsgFactory.Create(nameof(GAME_LOGS_HEADER));
 
   public static IMsg GAME_LOGS_FOOTER
     => MsgFactory.Create(nameof(GAME_LOGS_FOOTER));
 
+  public static IMsg ROLE_REVEAL_DEATH(IRole killerRole) {
+    return MsgFactory.Create(nameof(ROLE_REVEAL_DEATH),
+      GetRolePrefix(killerRole) + killerRole.Name);
+  }
+
   public static IMsg ROLE_ASSIGNED(IRole role) {
     return MsgFactory.Create(nameof(ROLE_ASSIGNED), role.Name);
   }

TTT/Game/lang/en.yml

@@ -3,6 +3,9 @@ ROLE_INNOCENT: "{green}Innocent"
 ROLE_DETECTIVE: "{blue}Detective"
 ROLE_TRAITOR: "{red}Traitor"
 ROLE_ASSIGNED: "%PREFIX%You are %an% {0}{grey}!"
+ROLE_REVEAL_DEATH: "%PREFIX%Your killer was %an% {0}{grey}!"
+ROLE_REVEAL_TRAITORS_HEADER: "%PREFIX%Your {red}Traitor {grey}teammates are:"
+ROLE_REVEAL_TRAITORS_NONE: "%PREFIX%You have no {red}Traitor {grey}teammates."
 GENERIC_UNKNOWN: "%PREFIX%{red}Unknown Command: {darkred}{0}"
 GENERIC_NO_PERMISSION: "%PREFIX%{red}You do not have permission to use this command."
 GENERIC_NO_PERMISSION_NODE: "%PREFIX%{red}You are missing the {darkred}{0}{red} permission."

TTT/Shop/Commands/BalanceCommand.cs

@@ -2,11 +2,16 @@
 using ShopAPI;
 using TTT.API.Command;
 using TTT.API.Player;
+using TTT.Locale;
 
 namespace TTT.Shop.Commands;
 
 public class BalanceCommand(IServiceProvider provider) : ICommand {
+  private readonly IMsgLocalizer locale =
+    provider.GetRequiredService<IMsgLocalizer>();
+
   private readonly IShop shop = provider.GetRequiredService<IShop>();
+
   public string Id => "balance";
   public string[] Aliases => [Id, "bal", "credits", "money"];
 
@@ -21,7 +26,7 @@ public class BalanceCommand(IServiceProvider provider) : ICommand {
     }
 
     var bal = await shop.Load(executor);
-    info.ReplySync($"You have {bal} credits.");
+    info.ReplySync(locale[ShopMsgs.COMMAND_BALANCE(bal)]);
     return CommandResult.SUCCESS;
   }
 }

TTT/Shop/Commands/BuyCommand.cs

@@ -20,6 +20,9 @@ public class BuyCommand(IServiceProvider provider) : ICommand {
   public string Id => "buy";
   public void Start() { }
   public string[] Aliases => [Id, "purchase", "b"];
+  public string[] Usage => ["[item]"];
+
+  public bool MustBeOnMainThread => true;
 
   public Task<CommandResult> Execute(IOnlinePlayer? executor,
     ICommandInfo info) {
@@ -58,7 +61,7 @@ public class BuyCommand(IServiceProvider provider) : ICommand {
     if (item != null) return item;
 
     item = shop.Items.FirstOrDefault(it
-      => it.Name.Equals(query, StringComparison.OrdinalIgnoreCase));
+      => it.Name.Contains(query, StringComparison.OrdinalIgnoreCase));
 
     if (item != null) return item;
 

TTT/Shop/Commands/ListCommand.cs

@@ -2,14 +2,14 @@
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using TTT.API.Command;
-using TTT.API.Messages;
+using TTT.API.Game;
 using TTT.API.Player;
 
 namespace TTT.Shop.Commands;
 
 public class ListCommand(IServiceProvider provider) : ICommand {
-  private readonly IMessenger messenger =
-    provider.GetRequiredService<IMessenger>();
+  private readonly IGameManager games = provider
+   .GetRequiredService<IGameManager>();
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
@@ -19,12 +19,51 @@ public class ListCommand(IServiceProvider provider) : ICommand {
 
   public void Start() { }
 
-  public Task<CommandResult>
-    Execute(IOnlinePlayer? executor, ICommandInfo info) {
-    foreach (var item in shop.Items)
-      messenger.Message(executor,
-        $"{ChatColors.Grey}- {ChatColors.White}{item.Name} {ChatColors.Grey}- {item.Description}");
+  public async Task<CommandResult> Execute(IOnlinePlayer? executor,
+    ICommandInfo info) {
+    var items = new List<IShopItem>(shop.Items).Where(item
+        => executor == null
+        || games.ActiveGame is not { State: State.IN_PROGRESS }
+        || item.CanPurchase(executor) != PurchaseResult.WRONG_ROLE)
+     .ToList();
 
-    return Task.FromResult(CommandResult.SUCCESS);
+    items.Sort((a, b) => {
+      var aPrice = a.Config.Price;
+      var bPrice = b.Config.Price;
+      var aCanBuy = executor != null
+        && a.CanPurchase(executor) == PurchaseResult.SUCCESS;
+      var bCanBuy = executor != null
+        && b.CanPurchase(executor) == PurchaseResult.SUCCESS;
+
+      if (aCanBuy && !bCanBuy) return -1;
+      if (!aCanBuy && bCanBuy) return 1;
+      if (aPrice != bPrice) return aPrice.CompareTo(bPrice);
+      return string.Compare(a.Name, b.Name, StringComparison.Ordinal);
+    });
+
+    var balance = info.CallingPlayer == null ?
+      int.MaxValue :
+      await shop.Load(info.CallingPlayer);
+
+    foreach (var item in items)
+      info.ReplySync(formatItem(item,
+        item.Config.Price <= balance
+        && item.CanPurchase(info.CallingPlayer ?? executor!)
+        == PurchaseResult.SUCCESS));
+
+    return CommandResult.SUCCESS;
+  }
+
+  private string formatPrefix(IShopItem item, bool canBuy = true) {
+    if (!canBuy)
+      return
+        $" {ChatColors.Grey}- [{ChatColors.DarkRed}{item.Config.Price}{ChatColors.Grey}] {ChatColors.Red}{item.Name}";
+    return
+      $" {ChatColors.Default}- [{ChatColors.Yellow}{item.Config.Price}{ChatColors.Default}] {ChatColors.Green}{item.Name}";
+  }
+
+  private string formatItem(IShopItem item, bool canBuy) {
+    return
+      $" {formatPrefix(item, canBuy)} {ChatColors.Grey} | {item.Description}";
   }
 }

TTT/Shop/Commands/ShopCommand.cs

@@ -14,14 +14,18 @@ public class ShopCommand(IServiceProvider provider) : ICommand {
   private readonly Dictionary<string, ICommand> subcommands = new() {
     ["list"]    = new ListCommand(provider),
     ["buy"]     = new BuyCommand(provider),
-    ["balance"] = new BalanceCommand(provider)
+    ["balance"] = new BalanceCommand(provider),
+    ["bal"]     = new BalanceCommand(provider)
   };
 
   public void Dispose() { }
   public string Id => "shop";
+  public string[] Usage => ["list", "buy [item]", "balance"];
 
   public void Start() { }
 
+  public bool MustBeOnMainThread => true;
+
   public Task<CommandResult>
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     HashSet<string> sent = [];

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

@@ -1,6 +1,7 @@
 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;
@@ -17,11 +18,11 @@ public static class StickerExtensions {
 
 public class Stickers(IServiceProvider provider)
   : RoleRestrictedItem<DetectiveRole>(provider) {
-  private readonly StickerConfig config = provider
-   .GetService<IStorage<StickerConfig>>()
+  private readonly StickersConfig config = provider
+   .GetService<IStorage<StickersConfig>>()
   ?.Load()
    .GetAwaiter()
-   .GetResult() ?? new StickerConfig();
+   .GetResult() ?? new StickersConfig();
 
   private readonly IIconManager? icons = provider.GetService<IIconManager>();
 

TTT/Shop/Items/Healthshot/HealthshotItem.cs

@@ -0,0 +1,38 @@
+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.Healthshot;
+
+public static class HealthshotServiceCollection {
+  public static void AddHealthshot(this IServiceCollection services) {
+    services.AddModBehavior<HealthshotItem>();
+  }
+}
+
+public class HealthshotItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly HealthshotConfig config =
+    provider.GetService<IStorage<HealthshotConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new HealthshotConfig();
+
+  public override string Name => Locale[HealthshotMsgs.SHOP_ITEM_HEALTHSHOT];
+
+  public override string Description
+    => Locale[HealthshotMsgs.SHOP_ITEM_HEALTHSHOT_DESC];
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Inventory.GiveWeapon(player, new BaseWeapon(config.Weapon));
+  }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return PurchaseResult.SUCCESS;
+  }
+}

TTT/Shop/Items/Healthshot/HealthshotMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.Shop.Items.Healthshot;
+
+public class HealthshotMsgs {
+  public static IMsg SHOP_ITEM_HEALTHSHOT
+    => MsgFactory.Create(nameof(SHOP_ITEM_HEALTHSHOT));
+
+  public static IMsg SHOP_ITEM_HEALTHSHOT_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_HEALTHSHOT_DESC));
+}

TTT/Shop/Items/OneShotDeagle/DeagleDamageListener.cs

@@ -31,7 +31,7 @@ public class DeagleDamageListener(IServiceProvider provider)
     if (attacker == null) return;
 
     var deagleItem = shop.GetOwnedItems(attacker)
-     .FirstOrDefault(s => s is OneShotDeagle);
+     .FirstOrDefault(s => s is OneShotDeagleItem);
     if (deagleItem == null) return;
 
     if (ev.Weapon != config.Weapon)

TTT/Shop/Items/OneShotDeagle/OneShotDeagleItem.cs

@@ -10,12 +10,12 @@ namespace TTT.Shop.Items;
 
 public static class DeagleServiceCollection {
   public static void AddDeagleServices(this IServiceCollection collection) {
-    collection.AddModBehavior<OneShotDeagle>();
+    collection.AddModBehavior<OneShotDeagleItem>();
     collection.AddModBehavior<DeagleDamageListener>();
   }
 }
 
-public class OneShotDeagle(IServiceProvider provider)
+public class OneShotDeagleItem(IServiceProvider provider)
   : BaseItem(provider), IWeapon {
   private readonly OneShotDeagleConfig deagleConfigStorage = provider
    .GetService<IStorage<OneShotDeagleConfig>>()

TTT/Shop/Items/Taser/TaserItem.cs

@@ -0,0 +1,37 @@
+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.Taser;
+
+public static class TaserServiceCollection {
+  public static void AddTaserItem(this IServiceCollection collection) {
+    collection.AddModBehavior<TaserItem>();
+  }
+}
+
+public class TaserItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly TaserConfig config =
+    provider.GetService<IStorage<TaserConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TaserConfig();
+
+  public override string Name => Locale[TaserMsgs.SHOP_ITEM_TASER];
+  public override string Description => Locale[TaserMsgs.SHOP_ITEM_TASER_DESC];
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    // Remove in case they already have it, to allow refresh of recharging taser
+    Inventory.RemoveWeapon(player, config.Weapon);
+    Inventory.GiveWeapon(player, new BaseWeapon(config.Weapon));
+  }
+
+  public override PurchaseResult CanPurchase(IOnlinePlayer player) {
+    return PurchaseResult.SUCCESS;
+  }
+}

TTT/Shop/Items/Taser/TaserMsgs.cs

@@ -0,0 +1,11 @@
+using TTT.Locale;
+
+namespace TTT.Shop.Items.Taser;
+
+public class TaserMsgs {
+  public static IMsg SHOP_ITEM_TASER
+    => MsgFactory.Create(nameof(SHOP_ITEM_TASER));
+
+  public static IMsg SHOP_ITEM_TASER_DESC
+    => MsgFactory.Create(nameof(SHOP_ITEM_TASER_DESC));
+}

TTT/Shop/Items/Traitor/Gloves/GlovesListener.cs

@@ -9,20 +9,18 @@ using TTT.API.Storage;
 using TTT.Game.Events.Body;
 using TTT.Game.Events.Game;
 using TTT.Game.Listeners;
-using TTT.Shop.Events;
 
 namespace TTT.Shop.Items.Traitor.Gloves;
 
 public class GlovesListener(IServiceProvider provider)
   : BaseListener(provider) {
-  private readonly GlovesConfig item =
+  private readonly GlovesConfig config =
     provider.GetService<IStorage<GlovesConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new GlovesConfig();
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
-
   private readonly Dictionary<IPlayer, int> uses = new();
 
   [UsedImplicitly]
@@ -33,7 +31,7 @@ public class GlovesListener(IServiceProvider provider)
     ev.Body.Killer = null;
     Messenger.Message(online,
       Locale[
-        GlovesMsgs.SHOP_ITEM_GLOVES_USED_KILL(uses[online], item.MaxUses)]);
+        GlovesMsgs.SHOP_ITEM_GLOVES_USED_KILL(uses[online], config.MaxUses)]);
   }
 
   [UsedImplicitly]
@@ -46,7 +44,7 @@ public class GlovesListener(IServiceProvider provider)
     Messenger.Message(ev.Identifier,
       Locale[
         GlovesMsgs.SHOP_ITEM_GLOVES_USED_BODY(uses[ev.Identifier],
-          item.MaxUses)]);
+          config.MaxUses)]);
   }
 
   [UsedImplicitly]
@@ -60,7 +58,7 @@ public class GlovesListener(IServiceProvider provider)
     if (player is not IOnlinePlayer online) return false;
     if (!uses.TryGetValue(player, out var useCount)) {
       if (!shop.HasItem<GlovesItem>(online)) return false;
-      uses[player] = item.MaxUses - 1;
+      uses[player] = config.MaxUses - 1;
       return true;
     }
 

TTT/Shop/Listeners/PlayerKillListener.cs

@@ -17,7 +17,7 @@ public class PlayerKillListener(IServiceProvider provider)
   [UsedImplicitly]
   [EventHandler]
   public async Task OnKill(PlayerDeathEvent ev) {
-    if (Games.ActiveGame is { State: State.IN_PROGRESS }) return;
+    if (Games.ActiveGame is not { State: State.IN_PROGRESS }) return;
     if (ev.Killer == null) return;
     var victimBal = await shop.Load(ev.Victim);
 
@@ -25,7 +25,7 @@ public class PlayerKillListener(IServiceProvider provider)
   }
 
   [UsedImplicitly]
-  [EventHandler]
+  [EventHandler(IgnoreCanceled = true)]
   public async Task OnIdentify(BodyIdentifyEvent ev) {
     if (ev.Identifier == null) return;
     var victimBal = await shop.Load(ev.Body.OfPlayer);
@@ -37,12 +37,12 @@ public class PlayerKillListener(IServiceProvider provider)
     if (!isGoodKill(ev.Body.Killer, ev.Body.OfPlayer)) {
       var killerBal = await shop.Load(killer);
       shop.AddBalance(killer, -killerBal / 4,
-        ev.Body.OfPlayer.Name + " kill invalidated");
+        ev.Body.OfPlayer.Name + " Bad Kill");
       return;
     }
 
     shop.AddBalance(killer, victimBal / 4,
-      ev.Body.OfPlayer.Name + " kill validated");
+      ev.Body.OfPlayer.Name + " Good Kill");
   }
 
   private bool isGoodKill(IPlayer attacker, IPlayer victim) {

TTT/Shop/Listeners/RoundShopClearer.cs

@@ -13,12 +13,12 @@ public class RoundShopClearer(IServiceProvider provider) : IListener {
 
   public void Dispose() { bus.UnregisterListener(this); }
 
-  [EventHandler(IgnoreCanceled = true, Priority = Priority.LOW)]
+  [EventHandler(IgnoreCanceled = true)]
   [UsedImplicitly]
   public void OnRoundStart(GameStateUpdateEvent ev) {
     // Only clear balances if the round is in progress
     // This is called only once, which means the round went from COUNTDOWN / WAITING -> IN_PROGRESS
-    if (ev.NewState != State.IN_PROGRESS) return;
+    if (ev.NewState != State.FINISHED) return;
     shop.ClearBalances();
     shop.ClearItems();
   }

TTT/Shop/PeriodicRewarder.cs

@@ -0,0 +1,42 @@
+using System.Reactive.Concurrency;
+using CounterStrikeSharp.API;
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using TTT.API;
+using TTT.API.Player;
+using TTT.API.Storage;
+
+namespace TTT.Shop;
+
+public class PeriodicRewarder(IServiceProvider provider) : ITerrorModule {
+  private readonly ShopConfig config = provider
+   .GetService<IStorage<ShopConfig>>()
+  ?.Load()
+   .GetAwaiter()
+   .GetResult() ?? new ShopConfig(provider);
+
+  private readonly IPlayerFinder finder =
+    provider.GetRequiredService<IPlayerFinder>();
+
+  private readonly IScheduler scheduler =
+    provider.GetRequiredService<IScheduler>();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
+  private IDisposable? timer;
+
+  public void Dispose() { timer?.Dispose(); }
+
+  public void Start() {
+    timer = scheduler.SchedulePeriodic(config.CreditRewardInterval,
+      issueRewards);
+  }
+
+  private void issueRewards() {
+    Server.NextWorldUpdate(() => {
+      foreach (var player in finder.GetOnline().Where(p => p.IsAlive))
+        shop.AddBalance(player, config.IntervalRewardAmount, "Time Reward");
+    });
+  }
+}

TTT/Shop/Shop.cs

@@ -1,11 +1,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
+using ShopAPI.Events;
 using TTT.API;
 using TTT.API.Events;
 using TTT.API.Messages;
 using TTT.API.Player;
 using TTT.Locale;
-using TTT.Shop.Events;
 
 namespace TTT.Shop;
 
@@ -68,6 +68,8 @@ public class Shop(IServiceProvider provider) : ITerrorModule, IShop {
 
   public void AddBalance(IOnlinePlayer player, int amount, string reason = "",
     bool print = true) {
+    messenger?.Debug(
+      $"Adding {amount} to {player.Name} ({player.Id}) balance. Reason: {reason}");
     if (amount == 0) return;
     balances.TryAdd(player.Id, 0);
 

TTT/Shop/ShopServiceCollection.cs

@@ -1,13 +1,19 @@
 using Microsoft.Extensions.DependencyInjection;
 using ShopAPI;
 using TTT.API.Extensions;
+using TTT.CS2.Items.Armor;
+using TTT.CS2.Items.BodyPaint;
 using TTT.CS2.Items.Camouflage;
 using TTT.CS2.Items.DNA;
+using TTT.CS2.Items.PoisonShots;
+using TTT.CS2.Items.PoisonSmoke;
 using TTT.CS2.Items.Station;
 using TTT.Shop.Commands;
 using TTT.Shop.Items;
 using TTT.Shop.Items.Detective.Stickers;
+using TTT.Shop.Items.Healthshot;
 using TTT.Shop.Items.M4A1;
+using TTT.Shop.Items.Taser;
 using TTT.Shop.Items.Traitor.C4;
 using TTT.Shop.Items.Traitor.Gloves;
 using TTT.Shop.Listeners;
@@ -20,11 +26,15 @@ public static class ShopServiceCollection {
 
     collection.AddModBehavior<RoundShopClearer>();
     collection.AddModBehavior<RoleAssignCreditor>();
+    collection.AddModBehavior<PlayerKillListener>();
+    collection.AddModBehavior<PeriodicRewarder>();
 
     collection.AddModBehavior<ShopCommand>();
     collection.AddModBehavior<BuyCommand>();
     collection.AddModBehavior<BalanceCommand>();
 
+    collection.AddArmorServices();
+    collection.AddBodyPaintServices();
     collection.AddC4Services();
     collection.AddCamoServices();
     collection.AddDamageStation();
@@ -32,7 +42,11 @@ public static class ShopServiceCollection {
     collection.AddDnaScannerServices();
     collection.AddGlovesServices();
     collection.AddHealthStation();
+    collection.AddHealthshot();
     collection.AddM4A1Services();
+    collection.AddPoisonShots();
+    collection.AddPoisonSmoke();
     collection.AddStickerServices();
+    collection.AddTaserItem();
   }
 }

TTT/Shop/lang/ShopMsgs.cs

@@ -1,9 +1,12 @@
+using CounterStrikeSharp.API.Modules.Utils;
 using ShopAPI;
 using TTT.Locale;
 
 namespace TTT.Shop;
 
 public static class ShopMsgs {
+  public static IMsg SHOP_PREFIX => MsgFactory.Create(nameof(SHOP_PREFIX));
+
   public static IMsg SHOP_INACTIVE => MsgFactory.Create(nameof(SHOP_INACTIVE));
 
   public static IMsg CREDITS_NAME => MsgFactory.Create(nameof(CREDITS_NAME));
@@ -20,15 +23,19 @@ public static class ShopMsgs {
   }
 
   public static IMsg CREDITS_GIVEN(int amo) {
-    return MsgFactory.Create(nameof(CREDITS_GIVEN), amo > 0 ? "+" : "-",
+    return MsgFactory.Create(nameof(CREDITS_GIVEN), getCreditPrefix(amo),
       Math.Abs(amo));
   }
 
   public static IMsg CREDITS_GIVEN_REASON(int amo, string reason) {
-    return MsgFactory.Create(nameof(CREDITS_GIVEN_REASON), amo > 0 ? "+" : "-",
+    return MsgFactory.Create(nameof(CREDITS_GIVEN_REASON), getCreditPrefix(amo),
       Math.Abs(amo), reason);
   }
 
+  private static string getCreditPrefix(int diff) {
+    return diff > 0 ? ChatColors.Green + "+" : ChatColors.Red + "-";
+  }
+
   public static IMsg SHOP_INSUFFICIENT_BALANCE(IShopItem item, int bal) {
     return MsgFactory.Create(nameof(SHOP_INSUFFICIENT_BALANCE), item.Name,
       item.Config.Price, bal);
@@ -37,4 +44,8 @@ public static class ShopMsgs {
   public static IMsg SHOP_CANNOT_PURCHASE_WITH_REASON(string reason) {
     return MsgFactory.Create(nameof(SHOP_CANNOT_PURCHASE_WITH_REASON), reason);
   }
+
+  public static IMsg COMMAND_BALANCE(int bal) {
+    return MsgFactory.Create(nameof(COMMAND_BALANCE), bal);
+  }
 }

TTT/Shop/lang/en.yml

@@ -1,5 +1,6 @@
-SHOP_INACTIVE: "%PREFIX%The shop is currently closed."
-SHOP_ITEM_NOT_FOUND: "%PREFIX%Could not find an item named \"{default}{0}{grey}\"."
+SHOP_PREFIX: "{green}SHOP {grey}| "
+SHOP_INACTIVE: "%SHOP_PREFIX%The shop is currently closed."
+SHOP_ITEM_NOT_FOUND: "%SHOP_PREFIX%Could not find an item named \"{default}{0}{grey}\"."
 
 SHOP_ITEM_DEAGLE: "One-Hit Revolver"
 SHOP_ITEM_DEAGLE_DESC: "A one-hit kill revolver with a single bullet. Aim carefully!"
@@ -7,7 +8,7 @@ SHOP_ITEM_DEAGLE_HIT_FF: "You hit a teammate!"
 
 SHOP_ITEM_STICKERS: "Stickers"
 SHOP_ITEM_STICKERS_DESC: "Reveal the roles of all players you taser to others."
-SHOP_ITEM_STICKERS_HIT: "%PREFIX%You got stickered, your role is now visible to everyone."
+SHOP_ITEM_STICKERS_HIT: "%SHOP_PREFIX%You got stickered, your role is now visible to everyone."
 
 SHOP_ITEM_C4: "C4 Explosive"
 SHOP_ITEM_C4_DESC: "A powerful explosive that blows up after a delay."
@@ -17,15 +18,23 @@ SHOP_ITEM_M4A1_DESC: "A fully automatic rifle with a silencer accompanied by a s
 
 SHOP_ITEM_GLOVES: "Gloves"
 SHOP_ITEM_GLOVES_DESC: "Lets you kill without DNA being left behind, or move bodies without identifying the body."
-SHOP_ITEM_GLOVES_USED_BODY: "%PREFIX%You used your gloves to move a body without leaving DNA. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
-SHOP_ITEM_GLOVES_USED_KILL: "%PREFIX%You used your gloves to kill without leaving DNA evidence. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
-SHOP_ITEM_GLOVES_WORN_OUT: "%PREFIX%Your gloves worn out."
+SHOP_ITEM_GLOVES_USED_BODY: "%SHOP_PREFIX%You used your gloves to move a body without leaving DNA. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
+SHOP_ITEM_GLOVES_USED_KILL: "%SHOP_PREFIX%You used your gloves to kill without leaving DNA evidence. ({yellow}{0}{grey}/{yellow}{1}{grey} use%s% left)."
+SHOP_ITEM_GLOVES_WORN_OUT: "%SHOP_PREFIX%Your gloves worn out."
 
-SHOP_INSUFFICIENT_BALANCE: "%PREFIX%You cannot afford {white}{0}{grey}, it costs {yellow}{1}{grey} credit%s%, and you have {yellow}{2}{grey}."
-SHOP_CANNOT_PURCHASE: "%PREFIX%You cannot purchase this item."
-SHOP_CANNOT_PURCHASE_WITH_REASON: "%PREFIX%You cannot purchase this item: {red}{0}{grey}."
-SHOP_PURCHASED: "%PREFIX%You purchased {white}{0}{grey}."
+SHOP_ITEM_TASER: "Taser"
+SHOP_ITEM_TASER_DESC: "A taser that allows you to identify the roles of players you hit."
+
+SHOP_ITEM_HEALTHSHOT: "Healthshot"
+SHOP_ITEM_HEALTHSHOT_DESC: "A healthshot that instantly heals you for 50 health."
+
+SHOP_INSUFFICIENT_BALANCE: "%SHOP_PREFIX%You cannot afford {white}{0}{grey}, it costs {yellow}{1}{grey} %CREDITS_NAME%%s%, and you have {yellow}{2}{grey}."
+SHOP_CANNOT_PURCHASE: "%SHOP_PREFIX%You cannot purchase this item."
+SHOP_CANNOT_PURCHASE_WITH_REASON: "%SHOP_PREFIX%You cannot purchase this item: {red}{0}{grey}."
+SHOP_PURCHASED: "%SHOP_PREFIX%You purchased {white}{0}{grey}."
 
 CREDITS_NAME: "credit"
-CREDITS_GIVEN: "%PREFIX%{0}{1} %CREDITS_NAME%%s%"
-CREDITS_GIVEN_REASON: "%PREFIX%{0}{1} %CREDITS_NAME%%s% {grey}({white}{2}{grey})"
+CREDITS_GIVEN: "%SHOP_PREFIX%{0}{1} %CREDITS_NAME%%s%"
+CREDITS_GIVEN_REASON: "%SHOP_PREFIX%{0}{1} %CREDITS_NAME%%s% {grey}({white}{2}{grey})"
+
+COMMAND_BALANCE: "%SHOP_PREFIX%You have {yellow}{0}{grey} %CREDITS_NAME%%s%."

TTT/ShopAPI/Configs/ArmorConfig.cs

@@ -0,0 +1,7 @@
+namespace ShopAPI.Configs;
+
+public record ArmorConfig : ShopItemConfig {
+  public override int Price { get; init; } = 80;
+  public int Armor { get; init; } = 100;
+  public bool Helmet { get; init; } = true;
+}

TTT/ShopAPI/Configs/BodyPaintConfig.cs

@@ -0,0 +1,9 @@
+using System.Drawing;
+
+namespace ShopAPI.Configs;
+
+public record BodyPaintConfig : ShopItemConfig {
+  public override int Price { get; init; } = 40;
+  public int MaxUses { get; init; } = 1;
+  public Color ColorToApply { get; init; } = Color.GreenYellow;
+}

TTT/ShopAPI/Configs/CamoConfig.cs

@@ -2,5 +2,5 @@ namespace ShopAPI.Configs;
 
 public record CamoConfig : ShopItemConfig {
   public override int Price { get; init; } = 100;
-  public float CamoVisibility { get; init; } = 0.5f;
+  public float CamoVisibility { get; init; } = 0.4f;
 }

TTT/ShopAPI/Configs/Detective/DnaScannerConfig.cs

@@ -1,7 +1,7 @@
-namespace ShopAPI.Configs;
+namespace ShopAPI.Configs.Detective;
 
 public record DnaScannerConfig : ShopItemConfig {
-  public override int Price { get; init; } = 100;
+  public override int Price { get; init; } = 120;
   public int MaxSamples { get; init; } = 0;
   public TimeSpan DecayTime { get; init; } = TimeSpan.FromSeconds(10);
 }

TTT/ShopAPI/Configs/Detective/HealthStationConfig.cs

@@ -1,16 +1,18 @@
 using System.Drawing;
 
-namespace ShopAPI.Configs;
+namespace ShopAPI.Configs.Detective;
 
 public record HealthStationConfig : StationConfig {
   public override string UseSound { get; init; } = "sounds/buttons/blip1";
 
+  public override int Price { get; init; } = 60;
+
   public override Color GetColor(float health) {
     // 100% health = white
-    // 10% health = green
-    var r = (int)(255 * (1 - health)); // goes from 255 → 0
-    var g = 255;                       // stays at 255
-    var b = (int)(255 * (1 - health)); // goes from 255 → 0
+    // 10% health = blue
+    var r = (int)(255 * health);
+    var g = (int)(255 * health);
+    var b = 255;
     return Color.FromArgb(r, g, b);
   }
 }

TTT/ShopAPI/Configs/Detective/StickerConfig.cs

@@ -1,5 +0,0 @@
-namespace ShopAPI.Configs;
-
-public record StickerConfig : ShopItemConfig {
-  public override int Price { get; init; } = 70;
-}

TTT/ShopAPI/Configs/Detective/StickersConfig.cs

@@ -0,0 +1,5 @@
+namespace ShopAPI.Configs.Detective;
+
+public record StickersConfig : ShopItemConfig {
+  public override int Price { get; init; } = 30;
+}

TTT/ShopAPI/Configs/M4A1Config.cs

@@ -1,7 +1,7 @@
 namespace ShopAPI.Configs;
 
 public record M4A1Config : ShopItemConfig {
-  public override int Price { get; init; } = 90;
+  public override int Price { get; init; } = 85;
   public int[] ClearSlots { get; init; } = [0, 1];
   public string[] Weapons { get; init; } = ["m4a1", "usps"];
 }

TTT/ShopAPI/Configs/ShopConfig.cs

@@ -27,9 +27,15 @@ public record ShopConfig(IRoleAssigner assigner) {
   public int CreditsForDetectiveVInnoKill { get; init; } = -6;
   public int CreditsForDetectiveVTraitorKill { get; init; } = 8;
   public int CreditsForAnyKill { get; init; } = 2;
+
   public float CreditMultiplierForAssisting { get; init; } = 0.5f;
   public float CreditsMultiplierForNotAssisted { get; init; } = 1.5f;
 
+  public TimeSpan CreditRewardInterval { get; init; } =
+    TimeSpan.FromSeconds(30);
+
+  public int IntervalRewardAmount { get; init; } = 8;
+
   public virtual int CreditsForKill(IOnlinePlayer attacker,
     IOnlinePlayer victim) {
     var attackerRole = assigner.GetRoles(attacker)

TTT/ShopAPI/Configs/StationConfig.cs

@@ -1,13 +1,11 @@
 using System.Drawing;
-using ShopAPI.Configs;
 
-namespace ShopAPI;
+namespace ShopAPI.Configs;
 
 public abstract record StationConfig : ShopItemConfig {
-  public override int Price { get; init; }
   public virtual int HealthIncrements { get; init; } = 5;
-  public virtual int TotalHealthGiven { get; init; } = 200;
-  public virtual int StationHealth { get; init; } = 100;
+  public virtual int TotalHealthGiven { get; init; } = 0;
+  public virtual int StationHealth { get; init; } = 1000;
   public virtual float MaxRange { get; init; } = 256;
 
   public virtual TimeSpan HealthInterval { get; init; } =

TTT/ShopAPI/Configs/TaserConfig.cs

@@ -0,0 +1,6 @@
+namespace ShopAPI.Configs;
+
+public record TaserConfig : ShopItemConfig {
+  public override int Price { get; init; } = 100;
+  public string Weapon { get; init; } = "taser";
+}

TTT/ShopAPI/Configs/Traitor/DamageStationConfig.cs

@@ -1,19 +1,21 @@
 using System.Drawing;
 
-namespace ShopAPI.Configs;
+namespace ShopAPI.Configs.Traitor;
 
 public record DamageStationConfig : StationConfig {
-  public override int HealthIncrements { get; init; } = -15;
-  public override int TotalHealthGiven { get; init; } = -300;
+  public override int HealthIncrements { get; init; } = -20;
+  public override int TotalHealthGiven { get; init; } = -3000;
 
   public override string UseSound { get; init; } = "sounds/buttons/blip2";
 
+  public override int Price { get; init; } = 65;
+
   public override Color GetColor(float health) {
-    // 101% health = white
+    // 100% health = white
     // 10% health = red
-    var r = 255;                       // stays at 255
-    var g = (int)(255 * (1 - health)); // goes from 255 → 0
-    var b = (int)(255 * (1 - health)); // goes from 255 → 0
+    var r = 255;
+    var g = (int)(255 * health);
+    var b = (int)(255 * health);
     return Color.FromArgb(r, g, b);
   }
 }

TTT/ShopAPI/Configs/Traitor/GlovesConfig.cs

@@ -1,6 +1,6 @@
 namespace ShopAPI.Configs.Traitor;
 
 public record GlovesConfig : ShopItemConfig {
-  public override int Price { get; init; }
+  public override int Price { get; init; } = 65;
   public int MaxUses { get; init; } = 3;
 }

TTT/ShopAPI/Configs/Traitor/PoisonConfig.cs

@@ -0,0 +1,10 @@
+namespace ShopAPI.Configs.Traitor;
+
+public record PoisonConfig {
+  public TimeSpan TimeBetweenDamage { get; init; } = TimeSpan.FromSeconds(2.5);
+  public int DamagePerTick { get; init; } = 5;
+  public int TotalDamage { get; init; } = 60;
+
+  public string PoisonSound { get; init; } =
+    "sounds/player/player_damagebody_03";
+}

TTT/ShopAPI/Configs/Traitor/PoisonShotsConfig.cs

@@ -0,0 +1,10 @@
+using System.Drawing;
+
+namespace ShopAPI.Configs.Traitor;
+
+public record PoisonShotsConfig : ShopItemConfig {
+  public override int Price { get; init; } = 65;
+  public int TotalShots { get; init; } = 3;
+  public Color PoisonColor { get; init; } = Color.FromArgb(128, Color.Purple);
+  public PoisonConfig PoisonConfig { get; init; } = new();
+}

TTT/ShopAPI/Configs/Traitor/PoisonSmokeConfig.cs

@@ -0,0 +1,12 @@
+namespace ShopAPI.Configs.Traitor;
+
+public record PoisonSmokeConfig : ShopItemConfig {
+  public override int Price { get; init; } = 30;
+
+  public string Weapon { get; init; } = "smoke";
+
+  public float SmokeRadius { get; init; } = 180;
+
+  public PoisonConfig PoisonConfig { get; init; } =
+    new() { DamagePerTick = 20, TotalDamage = 500 };
+}

TTT/ShopAPI/Events/PlayerBalanceEvent.cs

@@ -2,7 +2,7 @@
 using TTT.API.Player;
 using TTT.Game.Events.Player;
 
-namespace TTT.Shop.Events;
+namespace ShopAPI.Events;
 
 public class PlayerBalanceEvent(IPlayer player, int oldBalance, int newBalance,
   string? reason) : PlayerEvent(player), ICancelableEvent {

TTT/ShopAPI/Events/PlayerItemEvent.cs

@@ -1,8 +1,7 @@
-using ShopAPI;
-using TTT.API.Player;
+using TTT.API.Player;
 using TTT.Game.Events.Player;
 
-namespace TTT.Shop.Events;
+namespace ShopAPI.Events;
 
 public abstract class PlayerItemEvent(IPlayer player, IShopItem item)
   : PlayerEvent(player) {

TTT/ShopAPI/Events/PlayerPurchaseItemEvent.cs

@@ -1,8 +1,7 @@
-using ShopAPI;
-using TTT.API.Events;
+using TTT.API.Events;
 using TTT.API.Player;
 
-namespace TTT.Shop.Events;
+namespace ShopAPI.Events;
 
 public class PlayerPurchaseItemEvent(IPlayer player, IShopItem item)
   : PlayerItemEvent(player, item), ICancelableEvent {

TTT/ShopAPI/HealthshotConfig.cs

@@ -0,0 +1,8 @@
+using ShopAPI.Configs;
+
+namespace ShopAPI;
+
+public record HealthshotConfig : ShopItemConfig {
+  public override int Price { get; init; } = 25;
+  public string Weapon { get; init; } = "weapon_healthshot";
+}

TTT/Test/Shop/BalanceClearTest.cs

@@ -3,6 +3,8 @@ using ShopAPI;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
+using TTT.API.Role;
+using TTT.Game.Roles;
 using TTT.Shop.Listeners;
 using Xunit;
 
@@ -17,6 +19,9 @@ public class BalanceClearTest(IServiceProvider provider) {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
+  private readonly IRoleAssigner roles =
+    provider.GetRequiredService<IRoleAssigner>();
+
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
   [Fact]
@@ -30,9 +35,29 @@ public class BalanceClearTest(IServiceProvider provider) {
 
     var game = games.CreateGame();
     game?.Start();
+    game?.EndGame();
 
     var newBalance = await shop.Load(player);
 
     Assert.Equal(0, newBalance);
   }
+
+  [Fact]
+  public async Task RoleAssignCreditor_ShouldNotBeOverriden_OnGameStart() {
+    bus.RegisterListener(new RoleAssignCreditor(provider));
+    bus.RegisterListener(new RoundShopClearer(provider));
+    var player = TestPlayer.Random();
+    finder.AddPlayer(player);
+    finder.AddPlayer(TestPlayer.Random());
+
+    var game = games.CreateGame();
+    game?.Start();
+
+    var newBalance = await shop.Load(player);
+
+    var expected                                                    = 100;
+    if (roles.GetRoles(player).Any(r => r is TraitorRole)) expected = 120;
+
+    Assert.Equal(expected, newBalance);
+  }
 }

TTT/Test/Shop/Items/DeagleTests.cs

@@ -11,7 +11,7 @@ namespace TTT.Test.Shop.Items;
 
 public class DeagleTests {
   private readonly IEventBus bus;
-  private readonly OneShotDeagle item;
+  private readonly OneShotDeagleItem item;
   private readonly IServiceProvider provider;
   private readonly IShop shop;
   private readonly TestPlayer testPlayer;
@@ -23,7 +23,7 @@ public class DeagleTests {
     var finder = provider.GetRequiredService<IPlayerFinder>();
     shop = provider.GetRequiredService<IShop>();
     bus  = provider.GetRequiredService<IEventBus>();
-    item = new OneShotDeagle(provider);
+    item = new OneShotDeagleItem(provider);
 
     testPlayer = (finder.AddPlayer(TestPlayer.Random()) as TestPlayer)!;
     victim     = finder.AddPlayer(TestPlayer.Random());

TTT/Test/TestPlayer.cs

@@ -1,14 +1,13 @@
 using TTT.API.Player;
-using TTT.API.Role;
 
 namespace TTT.Test;
 
 public class TestPlayer(string id, string name) : IOnlinePlayer {
   public List<string> Messages { get; } = [];
 
-  [Obsolete(
-    "Roles are now managed via IRoleAssigner. Use IRoleAssigner.GetRoles(IPlayer) instead.")]
-  public ICollection<IRole> Roles { get; } = [];
+  // [Obsolete(
+  //   "Roles are now managed via IRoleAssigner. Use IRoleAssigner.GetRoles(IPlayer) instead.")]
+  // public ICollection<IRole> Roles { get; } = [];
 
   public string Id { get; } = id;
   public string Name { get; } = name;