From 14ba167201b5e8a2183aa72a7d60fab6d80374ae Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Sat, 28 Jan 2023 14:36:33 -0600
Subject: [PATCH] Improve aghosts controls (#13673)

---
 Content.Client/Input/ContentContexts.cs                   | 7 +++++++
 Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 1 +
 2 files changed, 8 insertions(+)

diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs
index feac437fe6..c3beda136d 100644
--- a/Content.Client/Input/ContentContexts.cs
+++ b/Content.Client/Input/ContentContexts.cs
@@ -82,7 +82,14 @@ namespace Content.Client.Input
             aghost.AddFunction(EngineKeyFunctions.Walk);
             aghost.AddFunction(ContentKeyFunctions.SwapHands);
             aghost.AddFunction(ContentKeyFunctions.Drop);
+            aghost.AddFunction(ContentKeyFunctions.UseItemInHand);
+            aghost.AddFunction(ContentKeyFunctions.AltUseItemInHand);
+            aghost.AddFunction(ContentKeyFunctions.ActivateItemInWorld);
             aghost.AddFunction(ContentKeyFunctions.ThrowItemInHand);
+            aghost.AddFunction(ContentKeyFunctions.AltActivateItemInWorld);
+            aghost.AddFunction(ContentKeyFunctions.TryPullObject);
+            aghost.AddFunction(ContentKeyFunctions.MovePulledObject);
+            aghost.AddFunction(ContentKeyFunctions.ReleasePulledObject);
 
             var ghost = contexts.New("ghost", "human");
             ghost.AddFunction(EngineKeyFunctions.MoveUp);
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 87d644fd6b..fc0418c4e0 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -13,6 +13,7 @@
   - type: Ghost
     canInteract: true
   - type: Hands
+  - type: Puller
   - type: DoAfter
   - type: CombatMode
   - type: Actions