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