diff --git a/SCPDiscordPlugin/EventListeners/EnvironmentEventListener.cs b/SCPDiscordPlugin/EventListeners/EnvironmentEventListener.cs
index 96ae8e21..a5fa4bb0 100644
--- a/SCPDiscordPlugin/EventListeners/EnvironmentEventListener.cs
+++ b/SCPDiscordPlugin/EventListeners/EnvironmentEventListener.cs
@@ -131,7 +131,13 @@ public void OnGeneratorFinish(GeneratorFinishEvent ev)
 		{
 			Dictionary<string, string> variables = new Dictionary<string, string>
 			{
-				{ "room", ev.Generator.Room.RoomType.ToString() }
+				{ "room",           ev.Generator.Room.RoomType.ToString()            },
+				{ "ipaddress",      ev.ActivatingPlayer.IPAddress                    },
+				{ "name",           ev.ActivatingPlayer.Name                         },
+				{ "playerid",       ev.ActivatingPlayer.PlayerID.ToString()          },
+				{ "steamid",        ev.ActivatingPlayer.GetParsedUserID()            },
+				{ "class",          ev.ActivatingPlayer.PlayerRole.RoleID.ToString() },
+				{ "team",           ev.ActivatingPlayer.PlayerRole.Team.ToString()   }
 			};
 			this.plugin.SendMessage(Config.GetArray("channels.ongeneratorfinish"), "environment.ongeneratorfinish", variables);
 		}
diff --git a/SCPDiscordPlugin/Languages/english-emote.yml b/SCPDiscordPlugin/Languages/english-emote.yml
index 3f46250c..c0b6f59d 100644
--- a/SCPDiscordPlugin/Languages/english-emote.yml
+++ b/SCPDiscordPlugin/Languages/english-emote.yml
@@ -285,10 +285,15 @@ environment:
         mtf:
             message: ":helicopter: **MTF helicopter is in visual range of the site, preparing to land.**"
             regex: []
-            
     ongeneratorfinish:
         # room
-        message: ":electric_plug: Generator has finished charging up in <var:room>"
+        # ipaddress
+        # name
+        # playerid
+        # steamid
+        # class
+        # team
+        message: ":electric_plug: Generator in <var:room> has been activated by <var:name> (<var:steamid>)."
         regex: [ ]
     onscpdeathannouncement:
         # ipaddress
diff --git a/SCPDiscordPlugin/Languages/english.yml b/SCPDiscordPlugin/Languages/english.yml
index 9e1381df..36127cd9 100644
--- a/SCPDiscordPlugin/Languages/english.yml
+++ b/SCPDiscordPlugin/Languages/english.yml
@@ -288,7 +288,13 @@ environment:
             regex: []
     ongeneratorfinish:
         # room
-        message: "Generator has finished charging up in <var:room>"
+        # ipaddress
+        # name
+        # playerid
+        # steamid
+        # class
+        # team
+        message: "Generator in <var:room> has been activated by <var:name> (<var:steamid>)."
         regex: [ ]
     onscpdeathannouncement:
         # ipaddress
diff --git a/SCPDiscordPlugin/lib/Assembly-CSharp.dll b/SCPDiscordPlugin/lib/Assembly-CSharp.dll
index 4c68ba5a..2ec57087 100644
Binary files a/SCPDiscordPlugin/lib/Assembly-CSharp.dll and b/SCPDiscordPlugin/lib/Assembly-CSharp.dll differ
diff --git a/SCPDiscordPlugin/lib/Smod2.dll b/SCPDiscordPlugin/lib/Smod2.dll
index b20734c2..5f2b6261 100644
Binary files a/SCPDiscordPlugin/lib/Smod2.dll and b/SCPDiscordPlugin/lib/Smod2.dll differ