Reconsidered receivers of notifications

FPtje · Dec 13, 2015 · 1db044d · 1db044d
1 parent 94ff9e8
commit 1db044d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 17 deletions.
diff --git a/gamemode/modules/fadmin/fadmin/playeractions/chatmute/cl_init.lua b/gamemode/modules/fadmin/fadmin/playeractions/chatmute/cl_init.lua
@@ -3,8 +3,6 @@ FAdmin.StartHooks["Chatmute"] = function()
         name = "chatmute",
         hasTarget = true,
         message = {"instigator", " chat muted ", "targets", " ", "extraInfo.1"},
-        receivers = "involved",
-        writeExtraInfo = function(info) net.WriteUInt(info, 16) end,
         readExtraInfo = function()
             local time = net.ReadUInt(16)
 
@@ -16,7 +14,6 @@ FAdmin.StartHooks["Chatmute"] = function()
         name = "chatunmute",
         hasTarget = true,
         message = {"instigator", " chat unmuted ", "targets"},
-        receivers = "involved",
     }
 
     FAdmin.Access.AddPrivilege("Chatmute", 2)

diff --git a/gamemode/modules/fadmin/fadmin/playeractions/chatmute/sv_init.lua b/gamemode/modules/fadmin/fadmin/playeractions/chatmute/sv_init.lua
@@ -52,14 +52,14 @@ FAdmin.StartHooks["Chatmute"] = function()
     FAdmin.Messages.RegisterNotification{
         name = "chatmute",
         hasTarget = true,
-        receivers = "involved",
+        receivers = "involved+admins",
         writeExtraInfo = function(info) net.WriteUInt(info, 16) end,
     }
 
     FAdmin.Messages.RegisterNotification{
         name = "chatunmute",
         hasTarget = true,
-        receivers = "involved",
+        receivers = "involved+admins",
     }
 
     FAdmin.Commands.AddCommand("Chatmute", MuteChat)

diff --git a/gamemode/modules/fadmin/fadmin/playeractions/freeze/sv_init.lua b/gamemode/modules/fadmin/fadmin/playeractions/freeze/sv_init.lua
@@ -55,14 +55,14 @@ FAdmin.StartHooks["Freeze"] = function()
     FAdmin.Messages.RegisterNotification{
         name = "freeze",
         hasTarget = true,
-        receivers = "admins",
+        receivers = "involved+admins",
         writeExtraInfo = function(info) net.WriteUInt(info, 16) end
     }
 
     FAdmin.Messages.RegisterNotification{
         name = "unfreeze",
         hasTarget = true,
-        receivers = "admins"
+        receivers = "involved+admins"
     }
 
     FAdmin.Commands.AddCommand("freeze", Freeze)

diff --git a/gamemode/modules/fadmin/fadmin/playeractions/health/sv_init.lua b/gamemode/modules/fadmin/fadmin/playeractions/health/sv_init.lua
@@ -27,7 +27,7 @@ FAdmin.StartHooks["Health"] = function()
     FAdmin.Messages.RegisterNotification{
         name = "sethealth",
         hasTarget = true,
-        receivers = "involved",
+        receivers = "everyone",
         writeExtraInfo = function(info) net.WriteUInt(info, 16) end,
     }
 

diff --git a/gamemode/modules/fadmin/fadmin/playeractions/ignite/sv_init.lua b/gamemode/modules/fadmin/fadmin/playeractions/ignite/sv_init.lua
@@ -48,15 +48,15 @@ FAdmin.StartHooks["Ignite"] = function()
     FAdmin.Messages.RegisterNotification{
         name = "ignite",
         hasTarget = true,
-        receivers = "admins",
+        receivers = "involved+admins",
         writeExtraInfo = function(info) net.WriteUInt(info, 16) end
     }
 
     FAdmin.Messages.RegisterNotification{
         name = "unignite",
         hasTarget = true,
         message = {"instigator", " unignited ", "targets"},
-        receivers = "admins",
+        receivers = "involved+admins",
     }
 
     FAdmin.Commands.AddCommand("Ignite", Ignite)

diff --git a/gamemode/modules/fadmin/fadmin/playeractions/jail/sh_shared.lua b/gamemode/modules/fadmin/fadmin/playeractions/jail/sh_shared.lua
@@ -15,7 +15,7 @@ FAdmin.StartHooks["Jailing"] = function()
         name = "jail",
         hasTarget = true,
         message = {"instigator", " jailed ", "targets", " ", "extraInfo.1"},
-        receivers = "admins",
+        receivers = "involved+admins",
         writeExtraInfo = function(info) net.WriteUInt(info, 16) end,
         readExtraInfo = function()
             local time = net.ReadUInt(16)
@@ -27,6 +27,6 @@ FAdmin.StartHooks["Jailing"] = function()
         name = "unjail",
         hasTarget = true,
         message = {"instigator", " unjailed ", "targets"},
-        receivers = "admins",
+        receivers = "involved+admins",
     }
 end
diff --git a/gamemode/modules/fadmin/fadmin/playeractions/ragdoll/sh_shared.lua b/gamemode/modules/fadmin/fadmin/playeractions/ragdoll/sh_shared.lua
@@ -14,7 +14,7 @@ FAdmin.StartHooks["Ragdolling"] = function()
         name = "ragdoll",
         hasTarget = true,
         message = {"instigator", " ragdolled ", "targets", " ", "extraInfo.1"},
-        receivers = "admins",
+        receivers = "involved+admins",
         writeExtraInfo = function(info) net.WriteUInt(info, 16) end,
         readExtraInfo = function()
             local time = net.ReadUInt(16)
@@ -23,7 +23,7 @@ FAdmin.StartHooks["Ragdolling"] = function()
     }
 
     FAdmin.Messages.RegisterNotification{
-        name = "unragdoll",
+        name = "involved+admins",
         hasTarget = true,
         message = {"instigator", " unragdolled ", "targets"},
         receivers = "admins",

diff --git a/gamemode/modules/fadmin/fadmin/playeractions/slap/sv_init.lua b/gamemode/modules/fadmin/fadmin/playeractions/slap/sv_init.lua
@@ -53,7 +53,7 @@ FAdmin.StartHooks["Slap"] = function()
     FAdmin.Messages.RegisterNotification{
         name = "slap",
         hasTarget = true,
-        receivers = "admins",
+        receivers = "involved+admins",
     }
 
     FAdmin.Commands.AddCommand("Slap", Slap)

diff --git a/gamemode/modules/fadmin/fadmin/playeractions/slay/sh_shared.lua b/gamemode/modules/fadmin/fadmin/playeractions/slay/sh_shared.lua
@@ -9,6 +9,6 @@ FAdmin.StartHooks["Slaying"] = function()
         name = "slay",
         hasTarget = true,
         message = {"instigator", " slayed ", "targets"},
-        receivers = "admins",
+        receivers = "involved+admins",
     }
 end
diff --git a/gamemode/modules/fadmin/fadmin/playeractions/strip_weapons/sv_init.lua b/gamemode/modules/fadmin/fadmin/playeractions/strip_weapons/sv_init.lua
@@ -21,7 +21,7 @@ FAdmin.StartHooks["StripWeapons"] = function()
     FAdmin.Messages.RegisterNotification{
         name = "stripweapons",
         hasTarget = true,
-        receivers = "involved",
+        receivers = "involved+admins",
     }
 
     FAdmin.Commands.AddCommand("StripWeapons", StripWeapons)