fix: Reduce karma grants per round

This reverts commit 8cd8e14e18.

README.md

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

SpecialRoundAPI/SpecialRoundAPI/AbstractSpecialRound.cs

@@ -1,22 +1,19 @@
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
+using SpecialRoundAPI.Configs;
 using TTT.API;
 using TTT.API.Events;
 using TTT.Game.Events.Game;
+using TTT.Game.Listeners;
 using TTT.Locale;
 
 namespace SpecialRoundAPI;
 
 public abstract class AbstractSpecialRound(IServiceProvider provider)
-  : ITerrorModule, IListener {
-  protected readonly IServiceProvider Provider = provider;
-
+  : BaseListener(provider) {
   protected readonly ISpecialRoundTracker Tracker =
     provider.GetRequiredService<ISpecialRoundTracker>();
 
-  public void Dispose() { }
-  public void Start() { }
-
   public abstract string Name { get; }
   public abstract IMsg Description { get; }
   public abstract SpecialRoundConfig Config { get; }

SpecialRoundAPI/SpecialRoundAPI/Configs/BhopRoundConfig.cs

@@ -1,4 +1,4 @@
-namespace SpecialRoundAPI;
+namespace SpecialRoundAPI.Configs;
 
 public record BhopRoundConfig : SpecialRoundConfig {
   public override float Weight { get; init; } = 0.2f;

SpecialRoundAPI/SpecialRoundAPI/Configs/SilentRoundConfig.cs

@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI.Configs;
+
+public record SilentRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.1f;
+}

SpecialRoundAPI/SpecialRoundAPI/Configs/SpecialRoundConfig.cs

@@ -1,4 +1,4 @@
-namespace SpecialRoundAPI;
+namespace SpecialRoundAPI.Configs;
 
 public abstract record SpecialRoundConfig {
   public abstract float Weight { get; init; }

SpecialRoundAPI/SpecialRoundAPI/Configs/SpeedRoundConfig.cs

@@ -1,8 +1,9 @@
-namespace SpecialRoundAPI;
+namespace SpecialRoundAPI.Configs;
 
 public record SpeedRoundConfig : SpecialRoundConfig {
-  public override float Weight { get; init; } = 0.4f;
+  public override float Weight { get; init; } = 0.6f;
 
-  public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(60);
+  public TimeSpan InitialSeconds { get; init; } = TimeSpan.FromSeconds(40);
   public TimeSpan SecondsPerKill { get; init; } = TimeSpan.FromSeconds(10);
+  public TimeSpan MaxTimeEver { get; init; } = TimeSpan.FromSeconds(90);
 }

SpecialRoundAPI/SpecialRoundAPI/Configs/SuppressedRoundConfig.cs

@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI.Configs;
+
+public record SuppressedRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.3f;
+}

SpecialRoundAPI/SpecialRoundAPI/Configs/VanillaRoundConfig.cs

@@ -0,0 +1,5 @@
+namespace SpecialRoundAPI.Configs;
+
+public record VanillaRoundConfig : SpecialRoundConfig {
+  public override float Weight { get; init; } = 0.2f;
+}

SpecialRoundAPI/SpecialRoundAPI/ISpecialRoundStarter.cs

@@ -2,9 +2,9 @@
 
 public interface ISpecialRoundStarter {
   /// <summary>
-  /// Attempts to start the given special round.
-  /// Will bypass most checks, but may still return null if starting the round
-  /// is not possible.
+  ///   Attempts to start the given special round.
+  ///   Will bypass most checks, but may still return null if starting the round
+  ///   is not possible.
   /// </summary>
   /// <param name="round"></param>
   /// <returns></returns>

SpecialRoundAPI/SpecialRoundAPI/SpecialRoundAPI.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Locale\Locale.csproj" />
-    <ProjectReference Include="..\..\TTT\API\API.csproj" />
-    <ProjectReference Include="..\..\TTT\Game\Game.csproj" />
+    <ProjectReference Include="..\..\Locale\Locale.csproj"/>
+    <ProjectReference Include="..\..\TTT\API\API.csproj"/>
+    <ProjectReference Include="..\..\TTT\Game\Game.csproj"/>
   </ItemGroup>
 
 </Project>

SpecialRoundAPI/SpecialRoundAPI/VanillaRoundConfig.cs

@@ -1,5 +0,0 @@
-namespace SpecialRoundAPI;
-
-public record VanillaRoundConfig : SpecialRoundConfig {
-  public override float Weight { get; init; } = 0.3f;
-}

TTT/API/Game/IAction.cs

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

TTT/API/Game/IActionLogger.cs

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

TTT/API/Player/IMuted.cs

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

TTT/API/Player/IPlayer.cs

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

TTT/CS2/Actions/TaserAction.cs

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

TTT/CS2/CS2.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj" />
+    <ProjectReference Include="..\..\SpecialRoundAPI\SpecialRoundAPI\SpecialRoundAPI.csproj"/>
     <ProjectReference Include="..\API\API.csproj"/>
     <ProjectReference Include="..\Game\Game.csproj"/>
     <ProjectReference Include="..\Karma\Karma.csproj"/>

TTT/CS2/CS2ServiceCollection.cs

@@ -1,6 +1,8 @@
 using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
 using ShopAPI.Configs;
+using ShopAPI.Configs.Detective;
 using ShopAPI.Configs.Traitor;
 using TTT.API.Command;
 using TTT.API.Extensions;
@@ -50,6 +52,20 @@ public static class CS2ServiceCollection {
      .AddModBehavior<IStorage<PoisonSmokeConfig>, CS2PoisonSmokeConfig>();
     collection.AddModBehavior<IStorage<KarmaConfig>, CS2KarmaConfig>();
     collection.AddModBehavior<IStorage<CamoConfig>, CS2CamoConfig>();
+    collection.AddModBehavior<IStorage<StickersConfig>, CS2StickersConfig>();
+    collection.AddModBehavior<IStorage<BodyPaintConfig>, CS2BodyPaintConfig>();
+    collection
+     .AddModBehavior<IStorage<DnaScannerConfig>, CS2DnaScannerConfig>();
+    collection
+     .AddModBehavior<IStorage<HealthStationConfig>, CS2HealthStationConfig>();
+    collection
+     .AddModBehavior<IStorage<ClusterGrenadeConfig>, CS2ClusterGrenadeConfig>();
+    collection.AddModBehavior<IStorage<GlovesConfig>, CS2GlovesConfig>();
+    collection
+     .AddModBehavior<IStorage<OneHitKnifeConfig>, CS2OneHitKnifeConfig>();
+    collection.AddModBehavior<IStorage<SilentAWPConfig>, CS2SilentAWPConfig>();
+    collection
+     .AddModBehavior<IStorage<HealthshotConfig>, CS2HealthshotConfig>();
 
     // TTT - CS2 Specific optionals
     collection.AddScoped<ITextSpawner, TextSpawner>();
@@ -68,7 +84,8 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<TraitorChatHandler>();
     collection.AddModBehavior<PlayerMuter>();
     collection.AddModBehavior<MapChangeCausesEndListener>();
-    collection.AddModBehavior<EntityTargetHandlers>();
+    collection.AddModBehavior<NameUpdater>();
+    // collection.AddModBehavior<EntityTargetHandlers>();
 
     // Damage Cancelers
     collection.AddModBehavior<OutOfRoundCanceler>();
@@ -84,6 +101,7 @@ public static class CS2ServiceCollection {
     collection.AddModBehavior<ScreenColorApplier>();
     collection.AddModBehavior<KarmaBanner>();
     collection.AddModBehavior<KarmaSyncer>();
+    collection.AddModBehavior<MapHookListener>();
 
     // Commands
     collection.AddModBehavior<TestCommand>();

TTT/CS2/Command/CS2CommandManager.cs

@@ -6,7 +6,6 @@ using TTT.API;
 using TTT.API.Command;
 using TTT.API.Messages;
 using TTT.API.Player;
-using TTT.Game;
 using TTT.Game.Commands;
 using TTT.Game.lang;
 

TTT/CS2/Command/PlayerPingShopAlias.cs

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

TTT/CS2/Command/Test/ReloadModuleCommand.cs

@@ -9,17 +9,12 @@ namespace TTT.CS2.Command.Test;
 
 public class ReloadModuleCommand(IServiceProvider provider)
   : ICommand, IPluginModule {
+  private BasePlugin? plugin;
   public void Dispose() { }
   public void Start() { }
-  private BasePlugin? plugin;
 
   public string Id => "reload";
 
-  public void Start(BasePlugin? plugin) {
-    if (plugin == null) return;
-    this.plugin = plugin;
-  }
-
   public string[] Usage => ["<module>"];
 
   public Task<CommandResult>
@@ -59,4 +54,9 @@ public class ReloadModuleCommand(IServiceProvider provider)
 
     return Task.FromResult(CommandResult.SUCCESS);
   }
+
+  public void Start(BasePlugin? plugin) {
+    if (plugin == null) return;
+    this.plugin = plugin;
+  }
 }

TTT/CS2/Command/Test/SetTargetCommand.cs

@@ -1,10 +1,8 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Command;
 using TTT.API.Player;
-using TTT.CS2.Utils;
 
 namespace TTT.CS2.Command.Test;
 
@@ -21,36 +19,10 @@ public class SetTargetCommand(IServiceProvider provider) : ICommand {
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     if (executor == null) return Task.FromResult(CommandResult.PLAYER_ONLY);
 
-    var name = "TRAITOR";
-
-    if (info.ArgCount == 2) name = info.Args[1];
-
     Server.NextWorldUpdate(() => {
       var gamePlayer = converter.GetPlayer(executor);
       if (gamePlayer == null) return;
-
-      var entity =
-        Utilities.FindAllEntitiesByDesignerName<CLogicRelay>("logic_relay");
-
-      var first =
-        entity.FirstOrDefault(e => e.Globalname == "ttt_traitor_assigner");
-
-      if (first == null) {
-        info.ReplySync("Could not find logic_relay ttt_traitor_assigner");
-      } else {
-        first.AcceptInput("Trigger", gamePlayer, gamePlayer);
-        info.ReplySync("Triggered logic_relay ttt_traitor_assigner");
-      }
-
       gamePlayer.Pawn.Value?.AcceptInput("AddContext", null, null, "TRAITOR:1");
-
-      if (gamePlayer.Entity != null) {
-        info.ReplySync("Current entity name: " + gamePlayer.Entity.Name);
-        EntityNameHelper.SetEntityName(gamePlayer.Entity, name);
-        info.ReplySync("Set entity name to " + gamePlayer.Entity.Name);
-      }
-
-      info.ReplySync("Set target name to " + name);
     });
     return Task.FromResult(CommandResult.SUCCESS);
   }

TTT/CS2/Command/Test/SpecCommand.cs

@@ -11,6 +11,8 @@ public class SpecCommand(IServiceProvider provider) : ICommand {
   public void Dispose() { }
   public void Start() { }
 
+  public string Id => "spec";
+
   public Task<CommandResult>
     Execute(IOnlinePlayer? executor, ICommandInfo info) {
     var target = executor;

TTT/CS2/Command/Test/SpecialRoundCommand.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using CounterStrikeSharp.API;
+using Microsoft.Extensions.DependencyInjection;
 using SpecialRoundAPI;
 using TTT.API;
 using TTT.API.Command;
@@ -25,7 +26,7 @@ public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
 
     var rounds = provider.GetServices<ITerrorModule>()
      .OfType<AbstractSpecialRound>()
-     .ToDictionary(r => r.GetType().Name.ToLower(), r => r);
+     .ToDictionary(r => r.Name.ToLower(), r => r);
 
     var roundName = info.Args[1].ToLower();
     if (!rounds.TryGetValue(roundName, out var round)) {
@@ -34,8 +35,10 @@ public class SpecialRoundCommand(IServiceProvider provider) : ICommand {
       return Task.FromResult(CommandResult.INVALID_ARGS);
     }
 
-    tracker.TryStartSpecialRound(round);
-    info.ReplySync($"Started special round '{roundName}'.");
+    Server.NextWorldUpdate(() => {
+      tracker.TryStartSpecialRound(round);
+      info.ReplySync($"Started special round '{roundName}'.");
+    });
     return Task.FromResult(CommandResult.SUCCESS);
   }
 }

TTT/CS2/Configs/CS2GameConfig.cs

@@ -63,21 +63,19 @@ public class CS2GameConfig : IStorage<TTTConfig>, IPluginModule {
 
   public static readonly FakeConVar<string> CV_TRAITOR_WEAPONS = new(
     "css_ttt_roleweapons_traitor",
-    "Weapons available to traitors at start of round",
-    "weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
-    new ItemValidator(allowMultiple: true));
+    "Weapons available to traitors at start of round", "",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_DETECTIVE_WEAPONS = new(
     "css_ttt_roleweapons_detective",
     "Weapons available to detectives at start of round",
-    "weapon_knife,weapon_taser,weapon_m4a1,weapon_revolver",
-    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
+    "weapon_taser,weapon_m4a1_silencer,weapon_revolver", ConVarFlags.FCVAR_NONE,
+    new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<string> CV_INNOCENT_WEAPONS = new(
     "css_ttt_roleweapons_innocent",
-    "Weapons available to innocents at start of round",
-    "weapon_knife,weapon_glock", ConVarFlags.FCVAR_NONE,
-    new ItemValidator(allowMultiple: true));
+    "Weapons available to innocents at start of round", "",
+    ConVarFlags.FCVAR_NONE, new ItemValidator(allowMultiple: true));
 
   public static readonly FakeConVar<int> CV_TIME_BETWEEN_ROUNDS = new(
     "css_ttt_time_between_rounds", "Time to wait between rounds in seconds", 1,

TTT/CS2/Configs/CS2KarmaConfig.cs

@@ -74,13 +74,13 @@ public class CS2KarmaConfig : IStorage<KarmaConfig>, IPluginModule {
 
   public static readonly FakeConVar<int> CV_KARMA_PER_ROUND = new(
     "css_ttt_karma_per_round",
-    "Amount of karma a player will gain at the end of each round", 2,
+    "Amount of karma a player will gain at the end of each round", 1,
     ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
 
   public static readonly FakeConVar<int> CV_KARMA_PER_ROUND_WIN = new(
     "css_ttt_karma_per_round_win",
     "Amount of karma a player will gain at the end of each round if their team won",
-    4, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
+    2, ConVarFlags.FCVAR_NONE, new RangeValidator<int>(0, 50));
 
   public void Dispose() { }
 

TTT/CS2/Configs/ShopItems/CS2BodyPaintConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2CamoConfig.cs

@@ -16,7 +16,7 @@ public class CS2CamoConfig : IStorage<CamoConfig>, IPluginModule {
   public static readonly FakeConVar<float> CV_CAMO_VISIBILITY = new(
     "css_ttt_shop_camo_visibility",
     "Player visibility multiplier while camouflaged (0 = invisible, 1 = fully visible)",
-    0.4f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
+    0.5f, ConVarFlags.FCVAR_NONE, new RangeValidator<float>(0f, 1f));
 
   public void Dispose() { }
 

TTT/CS2/Configs/ShopItems/CS2ClusterGrenadeConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2DnaScannerConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2GlovesConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2HealthStationConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2HealthshotConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2OneHitKnifeConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2OneShotDeagleConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2SilentAWPConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2StickersConfig.cs

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

TTT/CS2/Configs/ShopItems/CS2TaserConfig.cs

@@ -7,7 +7,7 @@ using TTT.API;
 using TTT.API.Storage;
 using TTT.CS2.Validators;
 
-namespace TTT.CS2.Configs;
+namespace TTT.CS2.Configs.ShopItems;
 
 public class CS2TaserConfig : IStorage<TaserConfig>, IPluginModule {
   public static readonly FakeConVar<int> CV_PRICE = new(

TTT/CS2/Extensions/PlayerExtensions.cs

@@ -119,8 +119,11 @@ public static class PlayerExtensions {
       SELF(player.Slot), 0.2f, 1);
   }
 
-  private static RecipientFilter SELF(int slot) => new(slot);
+  private static RecipientFilter SELF(int slot) {
+    return new RecipientFilter(slot);
+  }
 
-  private static RecipientFilter OTHERS(int slot)
-    => new(ulong.MaxValue & ~(1ul << slot));
+  private static RecipientFilter OTHERS(int slot) {
+    return new RecipientFilter(ulong.MaxValue & ~(1ul << slot));
+  }
 }

TTT/CS2/GameHandlers/BuyMenuHandler.cs

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

TTT/CS2/GameHandlers/CombatHandler.cs

@@ -52,6 +52,17 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
     return HookResult.Continue;
   }
 
+  [UsedImplicitly]
+  [GameEventHandler(HookMode.Pre)]
+  public HookResult OnPlayerDamage(EventPlayerHurt ev, GameEventInfo info) {
+    var player = ev.Userid;
+    if (player == null) return HookResult.Continue;
+
+    hideAndTrackStats(ev);
+
+    return HookResult.Continue;
+  }
+
   private void hideAndTrackStats(EventPlayerDeath ev,
     CCSPlayerController player) {
     var victimStats = player.ActionTrackingServices?.MatchStats;
@@ -89,6 +100,16 @@ public class CombatHandler(IServiceProvider provider) : IPluginModule {
         "m_pActionTrackingServices");
   }
 
+  private void hideAndTrackStats(EventPlayerHurt ev) {
+    var attackerStats = ev.Attacker?.ActionTrackingServices?.MatchStats;
+
+    if (attackerStats == null) return;
+    if (ev.Attacker == null) return;
+    attackerStats.Damage -= ev.DmgHealth;
+    Utilities.SetStateChanged(ev.Attacker, "CCSPlayerController",
+      "m_pActionTrackingServices");
+  }
+
   [UsedImplicitly]
   [GameEventHandler]
   public HookResult OnPlayerHurt(EventPlayerHurt ev, GameEventInfo _) {

TTT/CS2/GameHandlers/DamageCancelers/TaserListenCanceler.cs

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

TTT/CS2/GameHandlers/EntityTargetHandlers.cs

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

TTT/CS2/GameHandlers/NameUpdater.cs

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

TTT/CS2/GameHandlers/PlayerMuter.cs

@@ -18,15 +18,15 @@ public class PlayerMuter(IServiceProvider provider) : IPluginModule {
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly IGameManager game =
+    provider.GetRequiredService<IGameManager>();
+
   private readonly IMsgLocalizer locale =
     provider.GetRequiredService<IMsgLocalizer>();
 
   private readonly IMessenger messenger =
     provider.GetRequiredService<IMessenger>();
 
-  private readonly IGameManager game =
-    provider.GetRequiredService<IGameManager>();
-
   public void Dispose() { }
   public void Start() { }
 
@@ -66,8 +66,6 @@ public class PlayerMuter(IServiceProvider provider) : IPluginModule {
   public void OnGameEvent(GameStateUpdateEvent ev) {
     if (ev.NewState != State.FINISHED) return;
 
-    foreach (var p in Utilities.GetPlayers()) {
-      p.VoiceFlags &= ~VoiceFlags.Muted;
-    }
+    foreach (var p in Utilities.GetPlayers()) p.VoiceFlags &= ~VoiceFlags.Muted;
   }
 }

TTT/CS2/GameHandlers/PropMover.cs

@@ -51,7 +51,9 @@ public class PropMover(IServiceProvider provider) : IPluginModule {
       return;
     }
 
-    if (!pressed.HasFlag(PlayerButtons.Use)) return;
+    if (!pressed.HasFlag(PlayerButtons.Use)
+      && !pressed.HasFlag(PlayerButtons.Inspect))
+      return;
 
     onStartUse(player);
   }

TTT/CS2/GameHandlers/RoleIconsHandler.cs

@@ -6,7 +6,6 @@ using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API;
 using TTT.API.Events;
-using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.CS2.Extensions;

TTT/CS2/GameHandlers/RoundStart_GameStartHandler.cs

@@ -12,18 +12,18 @@ namespace TTT.CS2.GameHandlers;
 
 public class RoundStart_GameStartHandler(IServiceProvider provider)
   : IPluginModule {
-  private TTTConfig config
-    => provider.GetService<IStorage<TTTConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new TTTConfig();
-
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
+  private TTTConfig config
+    => provider.GetService<IStorage<TTTConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
   public void Dispose() { }
 
   public void Start() { }

TTT/CS2/GameHandlers/TeamChangeHandler.cs

@@ -11,12 +11,14 @@ using TTT.API.Game;
 using TTT.API.Player;
 using TTT.CS2.API;
 using TTT.CS2.Extensions;
-using TTT.Game;
 using TTT.Game.Events.Player;
 
 namespace TTT.CS2.GameHandlers;
 
 public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
+  private readonly IBodyTracker bodies =
+    provider.GetRequiredService<IBodyTracker>();
+
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
   private readonly IPlayerConverter<CCSPlayerController> converter =
@@ -25,9 +27,6 @@ public class TeamChangeHandler(IServiceProvider provider) : IPluginModule {
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
-  private readonly IBodyTracker bodies =
-    provider.GetRequiredService<IBodyTracker>();
-
   public void Dispose() { }
   public void Start() { }
 

TTT/CS2/GameHandlers/TraitorChatHandler.cs

@@ -29,11 +29,11 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
   private readonly IMessenger messenger =
     provider.GetRequiredService<IMessenger>();
 
+  private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
+
   private readonly IRoleAssigner roles =
     provider.GetRequiredService<IRoleAssigner>();
 
-  private readonly IMuted? mutedPlayers = provider.GetService<IMuted>();
-
   private IActain? maulService;
 
   public void Start(BasePlugin? plugin) {
@@ -79,7 +79,7 @@ public class TraitorChatHandler(IServiceProvider provider) : IPluginModule {
 
   private HookResult onSay(CCSPlayerController? player,
     CommandInfo commandInfo) {
-    if (mutedPlayers != null
+    if (mutedPlayers != null && player != null && player.GetHealth() > 0
       && mutedPlayers.Contains(player?.SteamID.ToString() ?? ""))
       return HookResult.Handled;
 

TTT/CS2/Items/Armor/ArmorItem.cs

@@ -16,15 +16,15 @@ public static class ArmorItemServicesCollection {
 }
 
 public class ArmorItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
   private 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;

TTT/CS2/Items/BodyPaint/BodyPaintListener.cs

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

TTT/CS2/Items/Camouflage/CamouflageItem.cs

@@ -18,15 +18,15 @@ public static class CamoServiceCollection {
 }
 
 public class CamouflageItem(IServiceProvider provider) : BaseItem(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
   private CamoConfig config
     => Provider.GetService<IStorage<CamoConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new CamoConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
   public override string Name => Locale[CamoMsgs.SHOP_ITEM_CAMO];
   public override string Description => Locale[CamoMsgs.SHOP_ITEM_CAMO_DESC];
   public override ShopItemConfig Config => config;

TTT/CS2/Items/ClusterGrenade/ClusterGrenadeListener.cs

@@ -1,9 +1,6 @@
-using System.Reactive.Concurrency;
-using CounterStrikeSharp.API;
+using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Core.Attributes.Registration;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 using CounterStrikeSharp.API.Modules.Utils;
 using JetBrains.Annotations;
 using Microsoft.Extensions.DependencyInjection;
@@ -11,23 +8,25 @@ using ShopAPI;
 using ShopAPI.Configs.Traitor;
 using TTT.API;
 using TTT.API.Player;
-using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Utils;
 
 namespace TTT.CS2.Items.ClusterGrenade;
 
 public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
   private ClusterGrenadeConfig config
     => provider.GetService<IStorage<ClusterGrenadeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new ClusterGrenadeConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
+  public void Dispose() { }
+  public void Start() { }
 
   [UsedImplicitly]
   [GameEventHandler]
@@ -60,7 +59,4 @@ public class ClusterGrenadeListener(IServiceProvider provider) : IPluginModule {
 
     return HookResult.Continue;
   }
-
-  public void Dispose() { }
-  public void Start() { }
 }

TTT/CS2/Items/Compass/AbstractCompassItem.cs

@@ -1,5 +1,3 @@
-using System.Linq;
-using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Timers;
 using CounterStrikeSharp.API.Modules.Utils;
@@ -10,7 +8,6 @@ using ShopAPI.Configs;
 using ShopAPI.Configs.Traitor;
 using TTT.API;
 using TTT.API.Events;
-using TTT.API.Extensions;
 using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
@@ -18,17 +15,15 @@ using TTT.API.Storage;
 using TTT.CS2.Extensions;
 using TTT.CS2.Utils;
 using TTT.Game.Events.Game;
-using TTT.Game.Roles;
 
 namespace TTT.CS2.Items.Compass;
 
 /// <summary>
-/// Base compass that renders a heading toward the nearest target returned by GetTargets.
-/// Child classes decide which targets to expose and who owns the item.
+///   Base compass that renders a heading toward the nearest target returned by GetTargets.
+///   Child classes decide which targets to expose and who owns the item.
 /// </summary>
 public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
   IListener, IPluginModule where TRole : class, IRole {
-  protected CompassConfig _Config { get; }
   protected readonly IPlayerConverter<CCSPlayerController> Converter;
   protected readonly ISet<IPlayer> Owners = new HashSet<IPlayer>();
 
@@ -42,6 +37,8 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
       provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
   }
 
+  protected CompassConfig _Config { get; }
+
   public override ShopItemConfig Config => _Config;
 
   public void Start(BasePlugin? plugin) {
@@ -56,14 +53,14 @@ public abstract class AbstractCompassItem<TRole> : RoleRestrictedItem<TRole>,
   }
 
   /// <summary>
-  /// Return world positions to point at for this player.
+  ///   Return world positions to point at for this player.
   /// </summary>
-  protected abstract IList<Vector> GetTargets(IOnlinePlayer requester);
+  abstract protected IList<Vector> GetTargets(IOnlinePlayer requester);
 
   /// <summary>
-  /// Whether this player currently owns/has this compass effect.
+  ///   Whether this player currently owns/has this compass effect.
   /// </summary>
-  protected abstract bool OwnsItem(IOnlinePlayer player);
+  abstract protected bool OwnsItem(IOnlinePlayer player);
 
   public override void OnPurchase(IOnlinePlayer player) { Owners.Add(player); }
 

TTT/CS2/Items/Compass/BodyCompassItem.cs

@@ -27,11 +27,11 @@ public class BodyCompassItem(IServiceProvider provider)
     => Locale[CompassMsgs.SHOP_ITEM_COMPASS_BODY_DESC];
 
   /// <summary>
-  /// For innocents: point to nearest traitor.
-  /// For traitors: point to nearest non-traitor (ally list in original code).
-  /// Returns target world positions as vectors.
+  ///   For innocents: point to nearest traitor.
+  ///   For traitors: point to nearest non-traitor (ally list in original code).
+  ///   Returns target world positions as vectors.
   /// </summary>
-  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+  override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
       return Array.Empty<Vector>();
 

TTT/CS2/Items/Compass/InnoCompassItem.cs

@@ -23,11 +23,11 @@ public class InnoCompassItem(IServiceProvider provider)
     => Locale[CompassMsgs.SHOP_ITEM_COMPASS_PLAYER_DESC];
 
   /// <summary>
-  /// For innocents: point to nearest traitor.
-  /// For traitors: point to nearest non-traitor (ally list in original code).
-  /// Returns target world positions as vectors.
+  ///   For innocents: point to nearest traitor.
+  ///   For traitors: point to nearest non-traitor (ally list in original code).
+  ///   Returns target world positions as vectors.
   /// </summary>
-  protected override IList<Vector> GetTargets(IOnlinePlayer requester) {
+  override protected IList<Vector> GetTargets(IOnlinePlayer requester) {
     if (Games.ActiveGame is not { State: State.IN_PROGRESS or State.FINISHED })
       return Array.Empty<Vector>();
 

TTT/CS2/Items/DNA/DnaListener.cs

@@ -28,15 +28,15 @@ public class DnaListener(IServiceProvider provider) : BaseListener(provider) {
   private readonly IBodyTracker bodies =
     provider.GetRequiredService<IBodyTracker>();
 
+  private readonly Dictionary<string, DateTime> lastMessages = new();
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
   private DnaScannerConfig config
     => Provider.GetService<IStorage<DnaScannerConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new DnaScannerConfig();
 
-  private readonly Dictionary<string, DateTime> lastMessages = new();
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
-
   // Low priority to allow body identification to happen first
   [UsedImplicitly]
   [EventHandler(Priority = Priority.LOW)]

TTT/CS2/Items/DNA/DnaMsgs.cs

@@ -1,6 +1,5 @@
 using TTT.API.Player;
 using TTT.API.Role;
-using TTT.Game;
 using TTT.Game.lang;
 using TTT.Locale;
 

TTT/CS2/Items/OneHitKnife/OneHitKnifeListener.cs

@@ -4,7 +4,6 @@ using ShopAPI;
 using ShopAPI.Configs.Traitor;
 using TTT.API.Events;
 using TTT.API.Game;
-using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.Game.Events.Player;
 using TTT.Game.Listeners;
@@ -13,14 +12,14 @@ namespace TTT.CS2.Items.OneHitKnife;
 
 public class OneHitKnifeListener(IServiceProvider provider)
   : BaseListener(provider) {
+  private readonly IShop shop = provider.GetRequiredService<IShop>();
+
   private OneHitKnifeConfig config
     => Provider.GetService<IStorage<OneHitKnifeConfig>>()
     ?.Load()
      .GetAwaiter()
      .GetResult() ?? new OneHitKnifeConfig();
 
-  private readonly IShop shop = provider.GetRequiredService<IShop>();
-
   [UsedImplicitly]
   [EventHandler]
   public void OnDamage(PlayerDamagedEvent ev) {

TTT/CS2/Items/PoisonShots/PoisonShotsItem.cs

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

TTT/CS2/Items/PoisonShots/PoisonShotsListener.cs

@@ -24,15 +24,11 @@ public class PoisonShotsListener(IServiceProvider provider)
   : BaseListener(provider), IPluginModule {
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
-  private PoisonShotsConfig config
-    => Provider.GetService<IStorage<PoisonShotsConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new PoisonShotsConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
+
   private readonly Dictionary<IPlayer, int> poisonShots = new();
 
   private readonly List<IDisposable> poisonTimers = [];
@@ -42,7 +38,11 @@ public class PoisonShotsListener(IServiceProvider provider)
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
-  private readonly Dictionary<string, IPlayer> killedWithPoison = new();
+  private PoisonShotsConfig config
+    => Provider.GetService<IStorage<PoisonShotsConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonShotsConfig();
 
   public override void Dispose() {
     base.Dispose();
@@ -156,13 +156,6 @@ public class PoisonShotsListener(IServiceProvider provider)
     return 0;
   }
 
-  private class PoisonEffect(IPlayer player, IPlayer shooter) {
-    public IPlayer Player { get; } = player;
-    public IPlayer Shooter { get; } = shooter;
-    public int Ticks { get; set; }
-    public int DamageGiven { get; set; }
-  }
-
 
   [UsedImplicitly]
   [EventHandler]
@@ -173,4 +166,11 @@ public class PoisonShotsListener(IServiceProvider provider)
       return;
     ev.Body.Killer = shooter as IOnlinePlayer;
   }
+
+  private class PoisonEffect(IPlayer player, IPlayer shooter) {
+    public IPlayer Player { get; } = player;
+    public IPlayer Shooter { get; } = shooter;
+    public int Ticks { get; set; }
+    public int DamageGiven { get; set; }
+  }
 }

TTT/CS2/Items/PoisonSmoke/PoisonSmokeItem.cs

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

TTT/CS2/Items/PoisonSmoke/PoisonSmokeListener.cs

@@ -12,7 +12,6 @@ using TTT.API;
 using TTT.API.Events;
 using TTT.API.Game;
 using TTT.API.Player;
-using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
 using TTT.Game.Events.Body;
@@ -25,20 +24,20 @@ namespace TTT.CS2.Items.PoisonSmoke;
 
 public class PoisonSmokeListener(IServiceProvider provider)
   : BaseListener(provider), IPluginModule {
-  private PoisonSmokeConfig config
-    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new PoisonSmokeConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
+  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+
   private readonly List<IDisposable> poisonSmokes = [];
 
   private readonly IShop shop = provider.GetRequiredService<IShop>();
 
-  private readonly ISet<string> killedWithPoison = new HashSet<string>();
+  private PoisonSmokeConfig config
+    => Provider.GetService<IStorage<PoisonSmokeConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new PoisonSmokeConfig();
 
   public override void Dispose() {
     base.Dispose();
@@ -129,15 +128,6 @@ public class PoisonSmokeListener(IServiceProvider provider)
     return effect.DamageGiven < config.PoisonConfig.TotalDamage;
   }
 
-  private class PoisonEffect(CSmokeGrenadeProjectile projectile,
-    IOnlinePlayer attacker) {
-    public int Ticks { get; set; }
-    public int DamageGiven { get; set; }
-    public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
-    public CSmokeGrenadeProjectile Projectile { get; } = projectile;
-    public IPlayer Attacker { get; } = attacker;
-  }
-
   [UsedImplicitly]
   [EventHandler]
   public void OnGameEnd(GameStateUpdateEvent ev) {
@@ -153,4 +143,13 @@ public class PoisonSmokeListener(IServiceProvider provider)
     if (ev.Body.Killer == null || ev.Body.Killer.Id == ev.Body.OfPlayer.Id)
       ev.IsCanceled = true;
   }
+
+  private class PoisonEffect(CSmokeGrenadeProjectile projectile,
+    IOnlinePlayer attacker) {
+    public int Ticks { get; set; }
+    public int DamageGiven { get; set; }
+    public Vector Origin { get; } = projectile.AbsOrigin.Clone()!;
+    public CSmokeGrenadeProjectile Projectile { get; } = projectile;
+    public IPlayer Attacker { get; } = attacker;
+  }
 }

TTT/CS2/Items/SilentAWP/SilentAWPItem.cs

@@ -24,18 +24,18 @@ public static class SilentAWPServiceCollection {
 
 public class SilentAWPItem(IServiceProvider provider)
   : RoleRestrictedItem<TraitorRole>(provider), IPluginModule {
-  private SilentAWPConfig config
-    => Provider.GetService<IStorage<SilentAWPConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new SilentAWPConfig();
-
   private readonly IPlayerConverter<CCSPlayerController> playerConverter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
   private readonly IDictionary<string, int> silentShots =
     new Dictionary<string, int>();
 
+  private SilentAWPConfig config
+    => Provider.GetService<IStorage<SilentAWPConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new SilentAWPConfig();
+
   public override string Name => Locale[SilentAWPMsgs.SHOP_ITEM_SILENT_AWP];
 
   public override string Description

TTT/CS2/Items/Station/DamageStation.cs

@@ -7,10 +7,8 @@ using TTT.API.Events;
 using TTT.API.Extensions;
 using TTT.API.Game;
 using TTT.API.Player;
-using TTT.API.Role;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
-using TTT.CS2.Utils;
 using TTT.Game.Events.Body;
 using TTT.Game.Events.Game;
 using TTT.Game.Events.Player;
@@ -38,17 +36,13 @@ public class DamageStation(IServiceProvider provider)
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
-  private readonly IRoleAssigner roles =
-    provider.GetRequiredService<IRoleAssigner>();
+  private readonly Dictionary<string, StationInfo> killedWithStation = new();
 
   public override string Name => Locale[StationMsgs.SHOP_ITEM_STATION_HURT];
 
   public override string Description
     => Locale[StationMsgs.SHOP_ITEM_STATION_HURT_DESC];
 
-  private Dictionary<string, StationInfo> killedWithStation =
-    new Dictionary<string, StationInfo>();
-
   override protected void onInterval() {
     var players  = finder.GetOnline();
     var toRemove = new List<CPhysicsPropMultiplayer>();
@@ -71,7 +65,6 @@ public class DamageStation(IServiceProvider provider)
        .Where(m => m.GamePlayer != null);
 
       var playerDists = playerMapping
-       .Where(t => !roles.GetRoles(t.ApiPlayer).OfType<TraitorRole>().Any())
        .Select(t => (t.ApiPlayer, Origin: t.GamePlayer!.Pawn.Value?.AbsOrigin,
           t.GamePlayer))
        .Where(t => t is { Origin: not null, ApiPlayer.IsAlive: true })
@@ -81,6 +74,11 @@ public class DamageStation(IServiceProvider provider)
        .ToList();
 
       foreach (var (player, dist, gamePlayer) in playerDists) {
+        if ((gamePlayer.Buttons & PlayerButtons.Walk) != PlayerButtons.Walk) {
+          gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
+          if (Roles.GetRoles(player).Any(r => r is TraitorRole)) continue;
+        }
+
         var healthScale = 1.0 - dist / _Config.MaxRange;
         var damageAmount =
           (int)Math.Floor(_Config.HealthIncrements * healthScale);
@@ -102,8 +100,6 @@ public class DamageStation(IServiceProvider provider)
 
         player.Health    += damageAmount;
         info.HealthGiven += damageAmount;
-
-        gamePlayer.EmitSound("Player.DamageFall", null, 0.2f);
       }
     }
 

TTT/CS2/Items/Station/HealthStation.cs

@@ -10,7 +10,8 @@ using TTT.Game.Roles;
 namespace TTT.CS2.Items.Station;
 
 public static class HealthStationCollection {
-  public static void AddHealthStation(this IServiceCollection collection) {
+  public static void
+    AddHealthStationServices(this IServiceCollection collection) {
     collection.AddModBehavior<HealthStation>();
   }
 }

TTT/CS2/Items/Station/StationItem.cs

@@ -23,7 +23,7 @@ public abstract class StationItem<T>(IServiceProvider provider,
   protected readonly IPlayerConverter<CCSPlayerController> Converter =
     provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
 
-  private readonly long PROP_SIZE_SQUARED = 500;
+  private readonly long PROP_SIZE_SQUARED = 700;
 
   protected readonly Dictionary<CPhysicsPropMultiplayer, StationInfo> props =
     new();
@@ -105,8 +105,8 @@ public abstract class StationItem<T>(IServiceProvider provider,
       "weapon_deagle"                              => 40,
       _ when Tag.PISTOLS.Contains(designerWeapon)  => 10,
       _ when Tag.SMGS.Contains(designerWeapon)     => 15,
-      _ when Tag.SHOTGUNS.Contains(designerWeapon) => 25,
-      _ when Tag.RIFLES.Contains(designerWeapon)   => 45,
+      _ when Tag.SHOTGUNS.Contains(designerWeapon) => 15,
+      _ when Tag.RIFLES.Contains(designerWeapon)   => 35,
       _                                            => 5
     };
   }

TTT/CS2/Items/TeleportDecoy/TeleportDecoyItem.cs

@@ -0,0 +1,39 @@
+using Microsoft.Extensions.DependencyInjection;
+using ShopAPI;
+using ShopAPI.Configs;
+using ShopAPI.Configs.Traitor;
+using TTT.API.Extensions;
+using TTT.API.Player;
+using TTT.API.Storage;
+using TTT.Game.Roles;
+
+namespace TTT.CS2.Items.TeleportDecoy;
+
+public static class TeleportDecoyServiceCollection {
+  public static void AddTeleportDecoyServices(
+    this IServiceCollection collection) {
+    collection.AddModBehavior<TeleportDecoyItem>();
+    collection.AddModBehavior<TeleportDecoyListener>();
+  }
+}
+
+public class TeleportDecoyItem(IServiceProvider provider)
+  : RoleRestrictedItem<TraitorRole>(provider) {
+  public override string Name
+    => Locale[TeleportDecoyMsgs.SHOP_ITEM_TELEPORT_DECOY];
+
+  public override string Description
+    => Locale[TeleportDecoyMsgs.SHOP_ITEM_TELEPORT_DECOY_DESC];
+
+  private TeleportDecoyConfig config
+    => Provider.GetService<IStorage<TeleportDecoyConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new TeleportDecoyConfig();
+
+  public override ShopItemConfig Config => config;
+
+  public override void OnPurchase(IOnlinePlayer player) {
+    Inventory.GiveWeapon(player, new BaseWeapon("weapon_decoy"));
+  }
+}

TTT/CS2/Items/TeleportDecoy/TeleportDecoyListener.cs

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

TTT/CS2/Items/TeleportDecoy/TeleportDecoyMsgs.cs

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

TTT/CS2/Listeners/AfkTimerListener.cs

@@ -1,5 +1,4 @@
-using System.Drawing;
-using System.Reactive.Concurrency;
+using System.Reactive.Concurrency;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
@@ -11,27 +10,25 @@ using TTT.API.Player;
 using TTT.API.Storage;
 using TTT.CS2.Extensions;
 using TTT.CS2.lang;
-using TTT.CS2.Utils;
 using TTT.Game;
 using TTT.Game.Events.Game;
 using TTT.Game.Listeners;
-using TTT.Game.Roles;
 
 namespace TTT.CS2.Listeners;
 
 public class AfkTimerListener(IServiceProvider provider)
   : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  private IDisposable? specTimer, specWarnTimer;
+
   private TTTConfig config
     => Provider.GetRequiredService<IStorage<TTTConfig>>()
      .Load()
      .GetAwaiter()
      .GetResult() ?? new TTTConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
-  private IDisposable? specTimer, specWarnTimer;
-
   public override void Dispose() {
     base.Dispose();
 

TTT/CS2/Listeners/BodyPickupListener.cs

@@ -8,7 +8,6 @@ using TTT.API.Player;
 using TTT.CS2.API;
 using TTT.CS2.Events;
 using TTT.CS2.Extensions;
-using TTT.Game;
 using TTT.Game.Events.Body;
 using TTT.Game.lang;
 using TTT.Game.Listeners;
@@ -35,6 +34,8 @@ public class BodyPickupListener(IServiceProvider provider)
     if (ev.Player is not IOnlinePlayer online)
       throw new InvalidOperationException("Player is not an online player.");
 
+    if (ev.Player.Id == body.OfPlayer.Id) return;
+
     var identifyEvent = new BodyIdentifyEvent(body, online);
 
     Bus.Dispatch(identifyEvent);

TTT/CS2/Listeners/KarmaBanner.cs

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

TTT/CS2/Listeners/MapHookListener.cs

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

TTT/CS2/Listeners/PlayerStatsTracker.cs

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

TTT/CS2/Listeners/RoundTimerListener.cs

@@ -22,17 +22,17 @@ namespace TTT.CS2.Listeners;
 
 public class RoundTimerListener(IServiceProvider provider)
   : BaseListener(provider) {
+  private readonly IPlayerConverter<CCSPlayerController> converter =
+    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
+
+  public IDisposable? EndTimer;
+
   private TTTConfig config
     => Provider.GetRequiredService<IStorage<TTTConfig>>()
      .Load()
      .GetAwaiter()
      .GetResult() ?? new TTTConfig();
 
-  private readonly IPlayerConverter<CCSPlayerController> converter =
-    provider.GetRequiredService<IPlayerConverter<CCSPlayerController>>();
-
-  public IDisposable? EndTimer;
-
   [UsedImplicitly]
   [EventHandler(IgnoreCanceled = true)]
   public void OnRoundStart(GameStateUpdateEvent ev) {

TTT/CS2/Player/CS2AliveSpoofer.cs

@@ -9,8 +9,8 @@ namespace TTT.CS2.Player;
 
 public class CS2AliveSpoofer : IAliveSpoofer, IPluginModule {
   private readonly HashSet<CCSPlayerController> _fakeAlivePlayers = new();
+  private BasePlugin? plugin;
   public ISet<CCSPlayerController> FakeAlivePlayers => _fakeAlivePlayers;
-  private BasePlugin? plugin = null;
 
   public void SpoofAlive(CCSPlayerController player) {
     if (player.IsBot) {

TTT/CS2/Player/CS2Player.cs

@@ -1,5 +1,6 @@
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Modules.Utils;
 using TTT.API.Player;
 
 namespace TTT.CS2.Player;
@@ -53,7 +54,7 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
   }
 
   public string Id { get; }
-  public string Name { get; }
+  public string Name { get; set; }
 
   public int Health {
     get => Player?.Pawn.Value != null ? Player.Pawn.Value.Health : 0;
@@ -96,7 +97,11 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
   }
 
   public bool IsAlive {
-    get => Player != null && Player.Pawn.Value is { Health: > 0 };
+    get
+      => Player != null && Player is {
+        Team             : CsTeam.CounterTerrorist or CsTeam.Terrorist,
+        Pawn.Value.Health: > 0
+      };
 
     set
       => throw new NotSupportedException(
@@ -114,14 +119,7 @@ public class CS2Player : IOnlinePlayer, IEquatable<CS2Player> {
 
   // Goal: Pad the name to a fixed width for better alignment in logs
   // Left-align ID, right-align name
-  private string createPaddedName() {
-    var onlineLengths = Utilities.GetPlayers()
-     .Select(p => p.PlayerName.Length)
-     .ToList();
-    if (onlineLengths.Count == 0) return CreatePaddedName(Id, Name, 13);
-    var namePadding = Math.Min(onlineLengths.Max(), 24);
-    return CreatePaddedName(Id, Name, namePadding + 8);
-  }
+  private string createPaddedName() { return CreatePaddedName(Id, Name, 24); }
 
   public static string CreatePaddedName(string id, string name, int len) {
     var suffix = id.Length > 5 ? id[^5..] : id.PadLeft(5, '0');

TTT/CS2/Utils/DamageDealingHelper.cs

@@ -1,7 +1,4 @@
-using System.Net;
-using System.Numerics;
-using System.Runtime.InteropServices;
-using CounterStrikeSharp.API;
+using System.Runtime.InteropServices;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Memory;
 using Vector = CounterStrikeSharp.API.Modules.Utils.Vector;

TTT/CS2/Utils/EntityNameHelper.cs

@@ -1,27 +0,0 @@
-using System.Runtime.InteropServices;
-using CounterStrikeSharp.API.Core;
-using CounterStrikeSharp.API.Modules.Memory;
-using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
-
-namespace TTT.CS2.Utils;
-
-public class EntityNameHelper {
-  private static readonly CEntityIdentity_SetEntityName
-    CEntityIdentity_SetEntityNameFunc;
-  // private static MemoryFunctionVoid<CEntityIdentity, string>
-  //   CEntityIdentity_SetEntityNameFunc;
-
-  static EntityNameHelper() {
-    var setEntityNameSignature = NativeAPI.FindSignature(Addresses.ServerPath,
-      GameData.GetSignature("CEntityIdentity_SetEntityNameFunc"));
-    CEntityIdentity_SetEntityNameFunc =
-      Marshal.GetDelegateForFunctionPointer<CEntityIdentity_SetEntityName>(
-        setEntityNameSignature);
-  }
-
-  private delegate void CEntityIdentity_SetEntityName(IntPtr ptr, string name);
-
-  public static void SetEntityName(CEntityIdentity identity, string name) {
-    CEntityIdentity_SetEntityNameFunc(identity.Handle, name);
-  }
-}

TTT/CS2/Utils/GrenadeDataHelper.cs

@@ -18,13 +18,13 @@ public class GrenadeDataHelper {
           heGrenadeSignature);
   }
 
-  private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
-    IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
-    int weaponId, byte team);
-
   public static int CreateGrenade(Vector position, QAngle angle,
     Vector velocity, Vector velocityAngle, IntPtr thrower, CsTeam team) {
     return CHEGrenadeProjectile_CreateFunc(position.Handle, angle.Handle,
       velocity.Handle, velocityAngle.Handle, thrower, 44, (byte)team);
   }
+
+  private delegate int CHEGrenadeProjectile_CreateDelegate(IntPtr position,
+    IntPtr angle, IntPtr velocity, IntPtr velocityAngle, IntPtr thrower,
+    int weaponId, byte team);
 }

TTT/CS2/gamedata/TTT.gamedata.json

@@ -33,12 +33,5 @@
       "windows": "48 89 5C 24 08 48 89 6C 24 10 48 89 74 24 18 57 48 83 EC 40 48 8B 6C 24 70",
       "linux": "55 4C 89 C1 48 89 E5 41 57 49 89 D7"
     }
-  },
-  "CEntityIdentity_SetEntityNameFunc": {
-    "signatures": {
-      "library": "server",
-      "windows": "48 89 5C 24 10 57 48 83 EC 20 48 8B D9 4C 8B C2",
-      "linux": "55 48 89 F2 48 89 E5 41 55 41 54 53"
-    }
   }
 }

TTT/CS2/lang/CS2Msgs.cs

@@ -1,6 +1,5 @@
 using TTT.API.Player;
 using TTT.API.Role;
-using TTT.Game;
 using TTT.Game.lang;
 using TTT.Locale;
 
@@ -13,6 +12,8 @@ public static class CS2Msgs {
   public static IMsg DEAD_MUTE_REMINDER
     => MsgFactory.Create(nameof(DEAD_MUTE_REMINDER));
 
+  public static IMsg AFK_MOVED => MsgFactory.Create(nameof(AFK_MOVED));
+
   public static IMsg TASER_SCANNED(IPlayer scannedPlayer, IRole role) {
     var rolePrefix = GameMsgs.GetRolePrefix(role);
     return MsgFactory.Create(nameof(TASER_SCANNED),
@@ -23,8 +24,6 @@ public static class CS2Msgs {
     return MsgFactory.Create(nameof(AFK_WARNING), span.TotalSeconds);
   }
 
-  public static IMsg AFK_MOVED => MsgFactory.Create(nameof(AFK_MOVED));
-
   public static IMsg TRAITOR_CHAT_FORMAT(IOnlinePlayer player, string msg) {
     return MsgFactory.Create(nameof(TRAITOR_CHAT_FORMAT), player.Name, msg);
   }

TTT/CS2/lang/en.yml

@@ -49,4 +49,7 @@ SHOP_ITEM_SILENT_AWP: "Silent AWP"
 SHOP_ITEM_SILENT_AWP_DESC: "Receive a silenced AWP with limited ammo."
 
 SHOP_ITEM_CLUSTER_GRENADE: "Cluster Grenade"
-SHOP_ITEM_CLUSTER_GRENADE_DESC: "A grenade that splits into multiple smaller grenades."
+SHOP_ITEM_CLUSTER_GRENADE_DESC: "A grenade that splits into multiple smaller grenades."
+
+SHOP_ITEM_TELEPORT_DECOY: "Teleport Decoy"
+SHOP_ITEM_TELEPORT_DECOY_DESC: "A decoy that teleports you to it upon explosion."

TTT/Game/Actions/DamagedAction.cs

@@ -3,6 +3,7 @@ using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.Game.Events.Player;
+using TTT.Game.Roles;
 
 namespace TTT.Game.Actions;
 
@@ -24,6 +25,12 @@ public class DamagedAction(IRoleAssigner roles, IPlayer victim,
   public string Verb => "damaged";
   public string Details => $"for {Damage} damage with {Weapon}";
 
+  public string Prefix
+    => PlayerRole != null && OtherRole != null
+      && PlayerRole is TraitorRole != OtherRole is TraitorRole ?
+        "" :
+        "[BAD] ";
+
   #region ConstructorAliases
 
   public DamagedAction(IServiceProvider provider, IPlayer victim,

TTT/Game/Actions/DeathAction.cs

@@ -3,6 +3,7 @@ using TTT.API.Game;
 using TTT.API.Player;
 using TTT.API.Role;
 using TTT.Game.Events.Player;
+using TTT.Game.Roles;
 
 namespace TTT.Game.Actions;
 
@@ -10,7 +11,7 @@ public class DeathAction(IRoleAssigner roles, IPlayer victim, IPlayer? killer)
   : IAction {
   public DeathAction(IRoleAssigner roles, PlayerDeathEvent ev) : this(roles,
     ev.Player, ev.Killer) {
-    Details = $"using {ev.Weapon}";
+    if (!string.IsNullOrWhiteSpace(ev.Weapon)) Details = $"using {ev.Weapon}";
   }
 
   public IPlayer Player { get; } = victim;
@@ -34,10 +35,16 @@ public class DeathAction(IRoleAssigner roles, IPlayer victim, IPlayer? killer)
       $" [{OtherRole.Name.First(char.IsAsciiLetter)}]" :
       "";
     return Other is not null ?
-      $"{Other}{oRole} {Verb} {Player}{pRole} {Details}" :
-      $"{Player}{pRole} {Verb} {Details}";
+      $"{Prefix}{Other}{oRole} {Verb} {Player}{pRole} {Details}" :
+      $"{Prefix}{Player}{pRole} {Verb} {Details}";
   }
 
+  public string Prefix
+    => PlayerRole != null && OtherRole != null
+      && PlayerRole is TraitorRole != OtherRole is TraitorRole ?
+        "" :
+        "[BAD] ";
+
   #region ConstructorAliases
 
   public DeathAction(IServiceProvider provider, IPlayer victim, IPlayer? killer)

TTT/Game/Actions/RoleAssignedAction.cs

@@ -11,5 +11,7 @@ public class RoleAssignedAction(IPlayer player, IRole role) : IAction {
   public IRole? OtherRole { get; } = null;
   public string Id => "basegame.action.roleassigned";
   public string Verb => "was assigned";
-  public string Details { get; } = role.Name;
+
+  public string Details { get; } =
+    new(role.Name.Where(char.IsAsciiLetter).ToArray());
 }

TTT/Game/Game.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Listeners\Stats\" />
+    <Folder Include="Listeners\Stats\"/>
   </ItemGroup>
 
 </Project>

TTT/Game/Listeners/GameRestartListener.cs

@@ -11,7 +11,7 @@ namespace TTT.Game.Listeners;
 
 public class GameRestartListener(IServiceProvider provider)
   : BaseListener(provider) {
-  private TTTConfig config =
+  private readonly TTTConfig config =
     provider.GetService<IStorage<TTTConfig>>()?.Load().GetAwaiter().GetResult()
     ?? new TTTConfig();
 

TTT/Game/Roles/BaseRole.cs

@@ -10,12 +10,6 @@ using TTT.Locale;
 namespace TTT.Game.Roles;
 
 public abstract class BaseRole(IServiceProvider provider) : IRole {
-  protected TTTConfig Config
-    => Provider.GetRequiredService<IStorage<TTTConfig>>()
-     .Load()
-     .GetAwaiter()
-     .GetResult() ?? new TTTConfig();
-
   protected readonly IInventoryManager Inventory =
     provider.GetRequiredService<IInventoryManager>();
 
@@ -29,6 +23,12 @@ public abstract class BaseRole(IServiceProvider provider) : IRole {
   protected readonly IRoleAssigner Roles =
     provider.GetRequiredService<IRoleAssigner>();
 
+  protected TTTConfig Config
+    => Provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
   public abstract string Id { get; }
   public abstract string Name { get; }
   public abstract Color Color { get; }

TTT/Game/Roles/RoleAssigner.cs

@@ -8,8 +8,10 @@ using TTT.Game.Events.Player;
 namespace TTT.Game.Roles;
 
 public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
-  private readonly IDictionary<IPlayer, ICollection<IRole>> assignedRoles =
-    new Dictionary<IPlayer, ICollection<IRole>>();
+  private static readonly Random rng = new();
+
+  private readonly IDictionary<string, ICollection<IRole>> assignedRoles =
+    new Dictionary<string, ICollection<IRole>>();
 
   private readonly IEventBus bus = provider.GetRequiredService<IEventBus>();
 
@@ -18,18 +20,18 @@ public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
 
   public void AssignRoles(ISet<IOnlinePlayer> players, IList<IRole> roles) {
     assignedRoles.Clear();
-    var  shuffled = players.OrderBy(_ => Guid.NewGuid()).ToHashSet();
+    var  shuffled = players.OrderBy(_ => rng.NextDouble()).ToHashSet();
     bool roleAssigned;
     do { roleAssigned = tryAssignRole(shuffled, roles); } while (roleAssigned);
   }
 
   public Task<ICollection<IRole>?> Load(IPlayer key) {
-    assignedRoles.TryGetValue(key, out var roles);
+    assignedRoles.TryGetValue(key.Id, out var roles);
     return Task.FromResult(roles);
   }
 
   public Task Write(IPlayer key, ICollection<IRole> newData) {
-    assignedRoles[key] = newData;
+    assignedRoles[key.Id] = newData;
     return Task.CompletedTask;
   }
 
@@ -44,9 +46,9 @@ public class RoleAssigner(IServiceProvider provider) : IRoleAssigner {
 
       if (ev.IsCanceled) continue;
 
-      if (!assignedRoles.ContainsKey(player))
-        assignedRoles[player] = new List<IRole>();
-      assignedRoles[player].Add(ev.Role);
+      if (!assignedRoles.ContainsKey(player.Id))
+        assignedRoles[player.Id] = new List<IRole>();
+      assignedRoles[player.Id].Add(ev.Role);
       ev.Role.OnAssign(player);
 
       onlineMessenger?.Debug(

TTT/Game/RoundBasedGame.cs

@@ -16,12 +16,6 @@ using TTT.Locale;
 namespace TTT.Game;
 
 public class RoundBasedGame(IServiceProvider provider) : IGame {
-  private TTTConfig config
-    => provider.GetRequiredService<IStorage<TTTConfig>>()
-     .Load()
-     .GetAwaiter()
-     .GetResult() ?? new TTTConfig();
-
   protected readonly IMsgLocalizer Locale =
     provider.GetRequiredService<IMsgLocalizer>();
 
@@ -29,6 +23,12 @@ public class RoundBasedGame(IServiceProvider provider) : IGame {
 
   protected State state = State.WAITING;
 
+  private TTTConfig config
+    => provider.GetRequiredService<IStorage<TTTConfig>>()
+     .Load()
+     .GetAwaiter()
+     .GetResult() ?? new TTTConfig();
+
   public virtual IList<IRole> Roles { get; } = [
     new InnocentRole(provider), new TraitorRole(provider),
     new DetectiveRole(provider)

TTT/Game/TTTConfig.cs

@@ -9,11 +9,12 @@ public record TTTConfig {
     public Func<int, int> TraitorCount { get; init; } =
       p => (int)Math.Ceiling((p - 1) / 5f);
 
-    public Func<int, int> DetectiveCount { get; init; } =
-      p => (int)Math.Floor(p / 8f);
+    public Func<int, int> DetectiveCount { get; init; } = p
+      => (int)Math.Ceiling(Math.Floor(p / 8f) / 1.5f);
 
     public Func<int, int> InnocentCount { get; init; } = p
-      => p - (int)Math.Ceiling((p - 1) / 5f) - (int)Math.Floor(p / 8f);
+      => p - (int)Math.Ceiling((p - 1) / 5f)
+      - (int)Math.Ceiling(Math.Floor(p / 8f) / 1.5f);
   }
 
   public record RoleConfig {

TTT/Karma/KarmaListener.cs

@@ -15,12 +15,6 @@ namespace TTT.Karma;
 public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
   private readonly Dictionary<string, int> badKills = new();
 
-  private KarmaConfig config
-    => Provider.GetService<IStorage<KarmaConfig>>()
-    ?.Load()
-     .GetAwaiter()
-     .GetResult() ?? new KarmaConfig();
-
   private readonly IGameManager games =
     provider.GetRequiredService<IGameManager>();
 
@@ -34,6 +28,12 @@ public class KarmaListener(IServiceProvider provider) : BaseListener(provider) {
 
   public bool GiveKarmaOnRoundEnd = true;
 
+  private KarmaConfig config
+    => Provider.GetService<IStorage<KarmaConfig>>()
+    ?.Load()
+     .GetAwaiter()
+     .GetResult() ?? new KarmaConfig();
+
   [EventHandler]
   [UsedImplicitly]
   public void OnRoundStart(GameStateUpdateEvent ev) { badKills.Clear(); }

TTT/Karma/KarmaStorage.cs

@@ -1,9 +1,5 @@
-using System.Collections.Concurrent;
-using System.Data;
-using System.Diagnostics;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Threading.Tasks;
+using System.Text;
+using System.Text.Json;
 using Microsoft.Extensions.DependencyInjection;
 using TTT.API.Events;
 using TTT.API.Player;
@@ -28,21 +24,24 @@ public sealed class KarmaStorage(IServiceProvider provider) : IKarmaService {
     if (!result.IsSuccessStatusCode) return config.DefaultKarma;
 
     var content = await result.Content.ReadAsStringAsync();
-    var json    = System.Text.Json.JsonDocument.Parse(content);
+    var json    = JsonDocument.Parse(content);
     if (!json.RootElement.TryGetProperty("karma", out var karmaElement))
       return config.DefaultKarma;
 
     return karmaElement.GetInt32();
   }
 
-  public Task Write(IPlayer key, int newData) {
-    var data = new { steam_id = key.Id, karma = newData };
+  public async Task Write(IPlayer key, int newData) {
+    var oldKarma         = await Load(key);
+    var karmaUpdateEvent = new KarmaUpdateEvent(key, oldKarma, newData);
+    provider.GetService<IEventBus>()?.Dispatch(karmaUpdateEvent);
+    if (karmaUpdateEvent.IsCanceled) return;
 
-    var payload = new StringContent(
-      System.Text.Json.JsonSerializer.Serialize(data),
-      System.Text.Encoding.UTF8, "application/json");
+    var data = new { steam_id = key.Id, karma = karmaUpdateEvent.Karma };
+    var payload = new StringContent(JsonSerializer.Serialize(data),
+      Encoding.UTF8, "application/json");
 
-    return client.PatchAsync("user/" + key.Id, payload);
+    await client.PatchAsync("user/" + key.Id, payload);
   }
 
   public void Dispose() { }

TTT/Plugin/TTT.cs

@@ -64,5 +64,4 @@ public class TTT(IServiceProvider provider) : BasePlugin {
 
     base.Dispose(disposing);
   }
-
 }

TTT/Plugin/TTTServiceCollection.cs

@@ -1,7 +1,6 @@
 using System.Reactive.Concurrency;
 using CounterStrikeSharp.API.Core;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using SpecialRound;
 using Stats;
 using TTT.CS2;

TTT/RTD/Actions/RolledAction.cs

@@ -0,0 +1,16 @@
+using TTT.API.Game;
+using TTT.API.Player;
+using TTT.API.Role;
+
+namespace TTT.RTD.Actions;
+
+public class RolledAction(IRoleAssigner roles, IPlayer player, string roll)
+  : IAction {
+  public IPlayer Player { get; } = player;
+  public IPlayer? Other { get; } = null;
+  public IRole? PlayerRole { get; } = roles.GetRoles(player).FirstOrDefault();
+  public IRole? OtherRole { get; } = null;
+  public string Id { get; } = "rtd.action.rolled";
+  public string Verb { get; } = "rolled";
+  public string Details { get; } = roll;
+}

TTT/RTD/AutoRTDCommand.cs

@@ -1,13 +1,10 @@
 using CounterStrikeSharp.API;
-using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Commands;
 using JetBrains.Annotations;
 using MAULActainShared.plugin.models;
 using Microsoft.Extensions.DependencyInjection;
-using TTT.API;
 using TTT.API.Command;
 using TTT.API.Events;
-using TTT.API.Game;
 using TTT.API.Messages;
 using TTT.API.Player;
 using TTT.CS2.Command;
@@ -19,18 +16,19 @@ using TTT.RTD.lang;
 namespace TTT.RTD;
 
 public class AutoRTDCommand(IServiceProvider provider) : ICommand, IListener {
-  public string Id => "autortd";
-  private ICookie? autoRtdCookie;
+  private readonly ICommandManager commands =
+    provider.GetRequiredService<ICommandManager>();
 
   private readonly IPlayerFinder finder =
     provider.GetRequiredService<IPlayerFinder>();
 
-  private readonly ICommandManager commands =
-    provider.GetRequiredService<ICommandManager>();
-
   private readonly IMsgLocalizer localizer =
     provider.GetRequiredService<IMsgLocalizer>();
 
+  private readonly Dictionary<string, bool> playerStatuses = new();
+  private ICookie? autoRtdCookie;
+  public string Id => "autortd";
+
   public bool MustBeOnMainThread => true;
 
   public void Dispose() { }
@@ -47,7 +45,6 @@ public class AutoRTDCommand(IServiceProvider provider) : ICommand, IListener {
   }
 
   public string[] RequiredFlags => ["@ttt/autortd"];
-  private Dictionary<string, bool> playerStatuses = new();
 
   public async Task<CommandResult> Execute(IOnlinePlayer? executor,
     ICommandInfo info) {