Unstable 0.1400.1.0

2021-05-20 16:12:54 +03:00
parent 92f0264af2
commit 5bc850cddb
181 changed files with 2475 additions and 1588 deletions
@@ -124,7 +124,7 @@ namespace Barotrauma
                                    npc.CampaignInteractionType = CampaignMode.InteractionType.Examine;
 #if CLIENT
                                    npc.SetCustomInteract(
-                                        Trigger,
+                                        (speaker, player) => { if (e1 == speaker) { Trigger(speaker, player); } else { Trigger(player, speaker); } },
                                        TextManager.GetWithVariable("CampaignInteraction.Examine", "[key]", GameMain.Config.KeyBindText(InputType.Use)));
 #else
                                    npc.SetCustomInteract(