Merge branch 'master' into DecimalReagents

Content.Client/Chat/ChatManager.cs

@@ -288,7 +288,7 @@ namespace Content.Client.Chat
             WriteChatMessage(storedMessage);
 
             // Local messages that have an entity attached get a speech bubble.
-            if (msg.Channel == ChatChannel.Local && msg.SenderEntity != default)
+            if ((msg.Channel == ChatChannel.Local || msg.Channel == ChatChannel.Dead) && msg.SenderEntity != default)
             {
                 AddSpeechBubble(msg);
             }

Content.Client/GameObjects/Components/Observer/GhostComponent.cs

@@ -0,0 +1,99 @@
+using Content.Client.UserInterface;
+using Content.Shared.GameObjects.Components.Observer;
+using Robust.Client.GameObjects;
+using Robust.Client.Player;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Network;
+using Robust.Shared.IoC;
+using Robust.Shared.ViewVariables;
+
+namespace Content.Client.GameObjects.Components.Observer
+{
+    [RegisterComponent]
+    public class GhostComponent : SharedGhostComponent
+    {
+        private GhostGui _gui;
+
+        [ViewVariables(VVAccess.ReadOnly)]
+        public bool CanReturnToBody { get; private set; } = true;
+
+#pragma warning disable 649
+        [Dependency] private readonly IGameHud _gameHud;
+        [Dependency] private readonly IPlayerManager _playerManager;
+        [Dependency] private IComponentManager _componentManager;
+#pragma warning restore 649
+
+        public override void OnRemove()
+        {
+            base.OnRemove();
+
+            _gui?.Dispose();
+        }
+
+
+        private void SetGhostVisibility(bool visibility)
+        {
+            // So, for now this is a client-side hack... Please, PLEASE someone make this work server-side.
+            foreach (var ghost in _componentManager.GetAllComponents(typeof(GhostComponent)))
+            {
+                if (ghost.Owner.TryGetComponent(out SpriteComponent component))
+                    component.Visible = visibility;
+            }
+        }
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            if (Owner.TryGetComponent(out SpriteComponent component))
+                component.Visible = _playerManager.LocalPlayer.ControlledEntity?.HasComponent<GhostComponent>() ?? false;
+        }
+
+        public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
+            IComponent component = null)
+        {
+            base.HandleMessage(message, netChannel, component);
+
+            switch (message)
+            {
+                case PlayerAttachedMsg _:
+                    if (_gui == null)
+                    {
+                        _gui = new GhostGui(this);
+                    }
+                    else
+                    {
+                        _gui.Orphan();
+                    }
+
+                    _gameHud.HandsContainer.AddChild(_gui);
+                    SetGhostVisibility(true);
+
+                    break;
+
+                case PlayerDetachedMsg _:
+                    _gui.Parent?.RemoveChild(_gui);
+                    SetGhostVisibility(false);
+                    break;
+            }
+        }
+
+        public void SendReturnToBodyMessage() => SendNetworkMessage(new ReturnToBodyComponentMessage());
+
+        public override void HandleComponentState(ComponentState curState, ComponentState nextState)
+        {
+            base.HandleComponentState(curState, nextState);
+
+            if (!(curState is GhostComponentState state)) return;
+
+            CanReturnToBody = state.CanReturnToBody;
+
+            if (Owner == _playerManager.LocalPlayer.ControlledEntity)
+            {
+                _gui?.Update();
+            }
+
+        }
+    }
+}

Content.Client/UserInterface/GhostGui.cs

@@ -0,0 +1,34 @@
+using System.Data;
+using Content.Client.GameObjects.Components.Observer;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.IoC;
+
+namespace Content.Client.UserInterface
+{
+    public class GhostGui : Control
+    {
+        public Button ReturnToBody = new Button(){Text = "Return to body"};
+        private GhostComponent _owner;
+
+        public GhostGui(GhostComponent owner)
+        {
+            IoCManager.InjectDependencies(this);
+
+            _owner = owner;
+
+            MouseFilter = MouseFilterMode.Ignore;
+
+            ReturnToBody.OnPressed += (args) => { owner.SendReturnToBodyMessage(); };
+
+            AddChild(ReturnToBody);
+
+            Update();
+        }
+
+        public void Update()
+        {
+            ReturnToBody.Disabled = !_owner.CanReturnToBody;
+        }
+    }
+}