From d5392d7f297cc051405ff3c86df1910ad68a77f6 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Thu, 14 Oct 2021 04:40:29 +1100 Subject: [PATCH] More admin ghost interactions (#4854) * more aghost interactions * restart test and fix some yaml spacing while at it. --- Content.Shared/Ghost/SharedGhostComponent.cs | 4 ++-- Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Ghost/SharedGhostComponent.cs b/Content.Shared/Ghost/SharedGhostComponent.cs index 55cfe3fc9d..f5545d137b 100644 --- a/Content.Shared/Ghost/SharedGhostComponent.cs +++ b/Content.Shared/Ghost/SharedGhostComponent.cs @@ -69,11 +69,11 @@ namespace Content.Shared.Ghost public bool CanInteract() => CanGhostInteract; public bool CanUse() => CanGhostInteract; - public bool CanThrow() => false; + public bool CanThrow() => CanGhostInteract; public bool CanDrop() => CanGhostInteract; public bool CanPickup() => CanGhostInteract; public bool CanEmote() => false; - public bool CanAttack() => false; + public bool CanAttack() => CanGhostInteract; } [Serializable, NetSerializable] diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index cae7ce5fe4..711d136468 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -10,6 +10,12 @@ - type: Ghost canInteract: true - type: Hands + - type: DoAfter + - type: CombatMode + - type: Actions + innateActions: + - CombatMode + - GhostBoo - type: PlayerInputMover - type: Physics bodyType: Kinematic