From 76562908313cbf993a3b4c9a80a3925d268c8164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20C=C3=A9sar=20Ueti?=
 <52474532+Mirino97@users.noreply.github.com>
Date: Fri, 15 Apr 2022 18:41:27 -0300
Subject: [PATCH] Add roles to Ghost Warp Menu (#7546)

---
 Content.Client/Ghost/UI/GhostTargetWindow.xaml    | 7 ++++---
 Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs | 7 ++++---
 Content.Server/Ghost/GhostSystem.cs               | 7 ++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Content.Client/Ghost/UI/GhostTargetWindow.xaml b/Content.Client/Ghost/UI/GhostTargetWindow.xaml
index 1107657ac5..df42f22c47 100644
--- a/Content.Client/Ghost/UI/GhostTargetWindow.xaml
+++ b/Content.Client/Ghost/UI/GhostTargetWindow.xaml
@@ -1,9 +1,10 @@
 <DefaultWindow xmlns="https://spacestation14.io"
             Title="{Loc 'ghost-target-window-title'}"
-            MinSize="300 450"
-            SetSize="300 450">
+            MinSize="450 450"
+            SetSize="450 450">
     <ScrollContainer VerticalExpand="True"
-                     HorizontalExpand="True">
+                     HorizontalExpand="True"
+					 HScrollEnabled="False">
         <BoxContainer Name="ButtonContainer"
                       Orientation="Vertical"
                       VerticalExpand="True"
diff --git a/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs b/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
index 9c43803c9d..7d242c428e 100644
--- a/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
+++ b/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using Content.Shared.Ghost;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
@@ -54,7 +55,7 @@ namespace Content.Client.Ghost.UI
                     HorizontalAlignment = HAlignment.Center,
                     VerticalAlignment = VAlignment.Center,
                     SizeFlagsStretchRatio = 1,
-                    MinSize = (230, 20),
+                    MinSize = (340, 20),
                     ClipText = true,
                 };
 
@@ -83,7 +84,7 @@ namespace Content.Client.Ghost.UI
                     HorizontalAlignment = HAlignment.Center,
                     VerticalAlignment = VAlignment.Center,
                     SizeFlagsStretchRatio = 1,
-                    MinSize = (230, 20),
+                    MinSize = (340, 20),
                     ClipText = true,
                 };
 
diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
index f3f07a2765..1c701a4f7f 100644
--- a/Content.Server/Ghost/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -253,7 +253,12 @@ namespace Content.Server.Ghost
             {
                 if (player.AttachedEntity is {Valid: true} attached)
                 {
-                    players.Add(attached, EntityManager.GetComponent<MetaDataComponent>(attached).EntityName);
+                    TryComp<MindComponent>(attached, out var mind);
+
+                    string playerInfo = $"{EntityManager.GetComponent<MetaDataComponent>(attached).EntityName} ({mind?.Mind?.CurrentJob?.Name ?? "Unknown"})";
+
+                    if (TryComp<MobStateComponent>(attached, out var state) && !state.IsDead())
+                        players.Add(attached, playerInfo);
                 }
             }