Adds PopupMessage to being hugged [Fix #7644] (#7698)

Content.Server/Interaction/Components/InteractionPopupComponent.cs

@@ -51,10 +51,10 @@ namespace Content.Server.Interaction.Components;
         public float SuccessChance = 1.0f; // Always succeed, unless specified otherwise on the yaml prototype.
 
         /// <summary>
-        /// Will the popup message be perceived by entities not involved in the interaction?
+        /// If set, shows a message to all surrounding players but NOT the current player.
         /// </summary>
-        [DataField("popupPerceivedByOthers")]
+        [DataField("messagePerceivedByOthers")]
-        public bool PopupPerceivedByOthers = false;
+        public string? MessagePerceivedByOthers;
 
         /// <summary>
         /// Will the sound effect be perceived by entities not involved in the interaction?

Content.Server/Interaction/InteractionPopupSystem.cs

@@ -56,8 +56,12 @@ public sealed class InteractionPopupSystem : EntitySystem
                 sfx = component.InteractFailureSound.GetSound();
         }
 
-        if (component.PopupPerceivedByOthers)
+        if (component.MessagePerceivedByOthers != null)
-            _popupSystem.PopupEntity(msg, uid, Filter.Pvs(uid)); //play for everyone in range
+        {
+            string msgOthers = Loc.GetString(component.MessagePerceivedByOthers,("user", args.User), ("target", uid));
+            _popupSystem.PopupEntity(msg, uid, Filter.Entities(args.User));
+            _popupSystem.PopupEntity(msgOthers, uid, Filter.Pvs(uid, 2F, EntityManager).RemoveWhereAttachedEntity(puid => puid == args.User));
+        }
         else
             _popupSystem.PopupEntity(msg, uid, Filter.Entities(args.User)); //play only for the initiating entity.
 

Resources/Locale/en-US/interaction/interaction-popup-component.ftl

@@ -39,3 +39,5 @@ comp-window-knock = *knock knock*
 ## Hugging players
 
 hugging-success-generic = You hug {THE($target)}.
+hugging-success-generic-others = { CAPITALIZE(THE($user)) } hugs {THE($target)}.
+hugging-success-generic-target = { CAPITALIZE(THE($user)) } hugs you.

Resources/Prototypes/Entities/Mobs/Player/dwarf.yml

@@ -9,6 +9,7 @@
       successChance: 1
       interactSuccessString: hugging-success-generic
       interactSuccessSound: /Audio/Effects/hug.ogg
+      messagePerceivedByOthers: hugging-success-generic-others
     - type: Mind
       showExamineInfo: true
     - type: Input

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -9,6 +9,7 @@
     successChance: 1
     interactSuccessString: hugging-success-generic
     interactSuccessSound: /Audio/Effects/hug.ogg
+    messagePerceivedByOthers: hugging-success-generic-others
   - type: Mind
     showExamineInfo: true
   - type: Input

Resources/Prototypes/Entities/Mobs/Player/reptilian.yml

@@ -9,6 +9,7 @@
       successChance: 1
       interactSuccessString: hugging-success-generic
       interactSuccessSound: /Audio/Effects/hug.ogg
+      messagePerceivedByOthers: hugging-success-generic-others
     - type: Mind
       showExamineInfo: true
     - type: Input

Resources/Prototypes/Entities/Mobs/Player/slime.yml

@@ -7,6 +7,7 @@
       successChance: 1
       interactSuccessString: hugging-success-generic
       interactSuccessSound: /Audio/Effects/hug.ogg
+      messagePerceivedByOthers: hugging-success-generic-others
     - type: Mind
       showExamineInfo: true
     - type: Input

Resources/Prototypes/Entities/Mobs/Player/vox.yml

@@ -8,6 +8,7 @@
       successChance: 1
       interactSuccessString: hugging-success-generic
       interactSuccessSound: /Audio/Effects/hug.ogg
+      messagePerceivedByOthers: hugging-success-generic-others
     - type: Mind
       showExamineInfo: true
     - type: Input

Resources/Prototypes/Entities/Structures/Windows/window.yml

@@ -69,7 +69,7 @@
     base: window
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
-    popupPerceivedByOthers: true
+    messagePerceivedByOthers: comp-window-knock
     interactSuccessSound:
       path: /Audio/Effects/glass_knock.ogg
   - type: Construction
@@ -110,7 +110,7 @@
     state: window
   - type: InteractionPopup
     interactSuccessString: comp-window-knock
-    popupPerceivedByOthers: true
+    messagePerceivedByOthers: comp-window-knock
     interactSuccessSound:
       path: /Audio/Effects/glass_knock.ogg
   - type: Physics