From d709695263517879837369a4df543f341cf70199 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <zddm@outlook.es>
Date: Sat, 9 Jan 2021 21:38:29 +0100
Subject: [PATCH] Disarm popup entity name fix

---
 .../GameObjects/Components/Mobs/StunnableComponent.cs           | 2 +-
 Content.Server/Interfaces/GameObjects/IDisarmedAct.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
index 041542e389..6d9970f114 100644
--- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
+++ b/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
@@ -140,7 +140,7 @@ namespace Content.Server.GameObjects.Components.Mobs
             EntitySystem.Get<AudioSystem>().PlayFromEntity("/Audio/Effects/thudswoosh.ogg", source,
                 AudioHelpers.WithVariation(0.025f));
 
-            source.PopupMessageOtherClients(Loc.GetString("{0} pushes {1}!", source, eventArgs.Target.Name));
+            source.PopupMessageOtherClients(Loc.GetString("{0} pushes {1}!", source.Name, eventArgs.Target.Name));
             source.PopupMessageCursor(Loc.GetString("You push {0}!", eventArgs.Target.Name));
 
             return true;
diff --git a/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs b/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs
index 8d2fd3b190..b1198b39d8 100644
--- a/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs
+++ b/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs
@@ -11,7 +11,7 @@ namespace Content.Server.Interfaces.GameObjects
         /// <summary>
         ///     Behavior when the entity is disarmed.
         ///     Return true to prevent the default disarm behavior,
-        ///     or rest of IDisarmAct behaviors that come after this one from happening.
+        ///     or rest of IDisarmedAct behaviors that come after this one from happening.
         /// </summary>
         bool Disarmed(DisarmedActEventArgs eventArgs);