diff -r 4de47ca41c58 -r 4b581bb374c8 plugins/basecomm.sp
--- a/plugins/basecomm.sp	Mon Sep 09 18:41:54 2013 -0400
+++ b/plugins/basecomm.sp	Tue Sep 10 09:52:37 2013 -0400
@@ -98,6 +98,22 @@
 	{
 		OnAdminMenuReady(topmenu);
 	}
+	
+	// Normally, OnClientSayCommand would be aqequate and more appropirate here, but it does
+	// not catch attempted chat triggers, which we also want to be blocked if a player is gagged.
+	AddCommandListener(Command_Say, "say");
+	AddCommandListener(Command_Say, "say_team");
+	
+	new String:gameDir[64];
+	GetGameFolderName(gameDir, sizeof(gameDir));
+	if (StrEqual(gameDir, "insurgency", false))
+	{
+		AddCommandListener(Command_Say, "say2");
+	}
+	else if (StrEqual(gameDir, "nucleardawn", false))
+	{
+		AddCommandListener(Command_Say, "say_squad");
+	}
 }
 
 public OnAdminMenuReady(Handle:topmenu)
@@ -151,7 +167,7 @@
 	return true;
 }
 
-public Action:OnClientSayCommand(client, const String:command[], const String:sArgs[])
+public Action:Command_Say(client, const String:command[], argc)
 {
 	if (client)
 	{