From fc75b6e10f9d94811833888c280bb2fd17f76fb7 Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Fri, 22 Mar 2024 13:40:57 +0300 Subject: [PATCH] - fix: Fix crawl. --- Content.Server/_Amour/InteractionPanel/Interactions.cs | 9 +++------ .../_Amour/InteractionPanel/Checks/Interaction.cs | 6 +++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Content.Server/_Amour/InteractionPanel/Interactions.cs b/Content.Server/_Amour/InteractionPanel/Interactions.cs index 08bf11f025..5884e05ba3 100644 --- a/Content.Server/_Amour/InteractionPanel/Interactions.cs +++ b/Content.Server/_Amour/InteractionPanel/Interactions.cs @@ -1,19 +1,16 @@ -using System.Numerics; using Content.Server._Amour.Animation; -using Content.Server._Amour.Crawl; using Content.Server._Amour.Hole; using Content.Server.Hands.Systems; using Content.Server.Pulling; -using Content.Shared._Amour.Animation; using Content.Shared._Amour.InteractionPanel; using Content.Shared.Hands.Components; -using Robust.Shared.Animations; +using Content.Shared.Standing; namespace Content.Server._Amour.InteractionPanel; public sealed class Interactions : EntitySystem { - [Dependency] private readonly CrawlSystem _crawlSystem = default!; + [Dependency] private readonly StandingStateSystem _standingState = default!; [Dependency] private readonly SharebleAnimationSystem _animationSystem = default!; [Dependency] private readonly PullingSystem _pullingSystem = default!; [Dependency] private readonly HoleSystem _holeSystem = default!; @@ -47,7 +44,7 @@ public sealed class Interactions : EntitySystem _pullingSystem.TryStartPull(uid, args.Target); break; case "CrawlTarget" : - _crawlSystem.EnableCrawl(args.Target); + _standingState.TryLieDown(args.Target); break; case "ItemOnButt": PutHole(uid,"Anus"); diff --git a/Content.Shared/_Amour/InteractionPanel/Checks/Interaction.cs b/Content.Shared/_Amour/InteractionPanel/Checks/Interaction.cs index 25c6aff207..beaf4b8939 100644 --- a/Content.Shared/_Amour/InteractionPanel/Checks/Interaction.cs +++ b/Content.Shared/_Amour/InteractionPanel/Checks/Interaction.cs @@ -1,4 +1,4 @@ -using Content.Shared._Amour.Crawl; +using Content.Shared.Standing; namespace Content.Shared._Amour.InteractionPanel.Checks; @@ -22,7 +22,7 @@ public sealed class IsUserCrawl : IInteractionCheck { public bool IsAvailable(Entity user, Entity target, IEntityManager entityManager) { - return entityManager.HasComponent(user); + return entityManager.System().IsDown(user); } } @@ -30,6 +30,6 @@ public sealed class IsTargetCrawl : IInteractionCheck { public bool IsAvailable(Entity user, Entity target, IEntityManager entityManager) { - return entityManager.HasComponent(target); + return entityManager.System().IsDown(target); } }