diff --git a/Content.Server/Buckle/Components/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs index 3d9b6c7f61..53af231968 100644 --- a/Content.Server/Buckle/Components/BuckleComponent.cs +++ b/Content.Server/Buckle/Components/BuckleComponent.cs @@ -130,11 +130,11 @@ namespace Content.Server.Buckle.Components ownTransform.WorldRotation = strapTransform.WorldRotation; break; case StrapPosition.Stand: - EntitySystem.Get().Stand(Owner); + EntitySystem.Get().Stand(Owner.Uid); ownTransform.WorldRotation = strapTransform.WorldRotation; break; case StrapPosition.Down: - EntitySystem.Get().Down(Owner, false, false); + EntitySystem.Get().Down(Owner.Uid, false, false); ownTransform.LocalRotation = Angle.Zero; break; } @@ -339,11 +339,11 @@ namespace Content.Server.Buckle.Components if (_stunnable is { KnockedDown: true } || (_mobState?.IsIncapacitated() ?? false)) { - EntitySystem.Get().Down(Owner); + EntitySystem.Get().Down(Owner.Uid); } else { - EntitySystem.Get().Stand(Owner); + EntitySystem.Get().Stand(Owner.Uid); } _mobState?.CurrentState?.EnterState(Owner); diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs index 8ac61641d7..9ee4bc16f1 100644 --- a/Content.Server/Instruments/InstrumentComponent.cs +++ b/Content.Server/Instruments/InstrumentComponent.cs @@ -362,7 +362,7 @@ namespace Content.Server.Instruments if (mob != null) { if (Handheld) - EntitySystem.Get().Down(mob, false); + EntitySystem.Get().Down(mob.Uid, false); if (mob.TryGetComponent(out StunnableComponent? stun)) { diff --git a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs index e330e904f1..55bf3ff6be 100644 --- a/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs @@ -40,7 +40,7 @@ namespace Content.Server.Morgue.Components protected override bool AddToContents(IEntity entity) { - if (entity.HasComponent() && !EntitySystem.Get().IsDown(entity)) return false; + if (entity.HasComponent() && !EntitySystem.Get().IsDown(entity.Uid)) return false; return base.AddToContents(entity); } diff --git a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs index fe6e615cfa..ad0445578d 100644 --- a/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs @@ -142,7 +142,7 @@ namespace Content.Server.Morgue.Components if (CanInsert(victim)) { Insert(victim); - EntitySystem.Get().Down(victim, false); + EntitySystem.Get().Down(victim.Uid, false); } else { diff --git a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs index a45d77a80e..6c0b027000 100644 --- a/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs +++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs @@ -68,7 +68,7 @@ namespace Content.Server.Morgue.Components protected override bool AddToContents(IEntity entity) { - if (entity.HasComponent() && !EntitySystem.Get().IsDown(entity)) + if (entity.HasComponent() && !EntitySystem.Get().IsDown(entity.Uid)) return false; return base.AddToContents(entity); } diff --git a/Content.Shared/Body/Components/SharedBodyComponent.cs b/Content.Shared/Body/Components/SharedBodyComponent.cs index d0580a93e3..eefea7d109 100644 --- a/Content.Shared/Body/Components/SharedBodyComponent.cs +++ b/Content.Shared/Body/Components/SharedBodyComponent.cs @@ -186,7 +186,7 @@ namespace Content.Shared.Body.Components if (part.PartType == BodyPartType.Leg && GetPartsOfType(BodyPartType.Leg).ToArray().Length == 0) { - EntitySystem.Get().Down(Owner); + EntitySystem.Get().Down(Owner.Uid); } if (part.IsVital && SlotParts.Count(x => x.Value.PartType == part.PartType) == 0) diff --git a/Content.Shared/MobState/State/SharedCriticalMobState.cs b/Content.Shared/MobState/State/SharedCriticalMobState.cs index bfde092263..470eba0b61 100644 --- a/Content.Shared/MobState/State/SharedCriticalMobState.cs +++ b/Content.Shared/MobState/State/SharedCriticalMobState.cs @@ -33,7 +33,7 @@ namespace Content.Shared.MobState.State { base.ExitState(entity); - EntitySystem.Get().Stand(entity); + EntitySystem.Get().Stand(entity.Uid); } public override bool CanInteract() diff --git a/Content.Shared/MobState/State/SharedDeadMobState.cs b/Content.Shared/MobState/State/SharedDeadMobState.cs index e3d4305e62..25b5c5ec2f 100644 --- a/Content.Shared/MobState/State/SharedDeadMobState.cs +++ b/Content.Shared/MobState/State/SharedDeadMobState.cs @@ -14,9 +14,9 @@ namespace Content.Shared.MobState.State var wake = entity.EnsureComponent(); wake.Enabled = true; var standingState = EntitySystem.Get(); - standingState.Down(entity); + standingState.Down(entity.Uid); - if (standingState.IsDown(entity) && entity.TryGetComponent(out PhysicsComponent? physics)) + if (standingState.IsDown(entity.Uid) && entity.TryGetComponent(out PhysicsComponent? physics)) { physics.CanCollide = false; } @@ -36,9 +36,9 @@ namespace Content.Shared.MobState.State } var standingState = EntitySystem.Get(); - standingState.Stand(entity); + standingState.Stand(entity.Uid); - if (!standingState.IsDown(entity) && entity.TryGetComponent(out PhysicsComponent? physics)) + if (!standingState.IsDown(entity.Uid) && entity.TryGetComponent(out PhysicsComponent? physics)) { physics.CanCollide = true; } diff --git a/Content.Shared/MobState/State/SharedNormalMobState.cs b/Content.Shared/MobState/State/SharedNormalMobState.cs index fd1863be10..943797f976 100644 --- a/Content.Shared/MobState/State/SharedNormalMobState.cs +++ b/Content.Shared/MobState/State/SharedNormalMobState.cs @@ -14,7 +14,7 @@ namespace Content.Shared.MobState.State public override void EnterState(IEntity entity) { base.EnterState(entity); - EntitySystem.Get().Stand(entity); + EntitySystem.Get().Stand(entity.Uid); if (entity.TryGetComponent(out SharedAppearanceComponent? appearance)) { diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs index ed6a125f8e..f12f51a465 100644 --- a/Content.Shared/Standing/StandingStateSystem.cs +++ b/Content.Shared/Standing/StandingStateSystem.cs @@ -14,12 +14,6 @@ namespace Content.Shared.Standing { [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; - [Obsolete("Use the EntityUid overloads instead.")] - public bool IsDown(IEntity entity) - { - return IsDown(entity.Uid); - } - public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null) { if (!Resolve(uid, ref standingState, false)) @@ -28,12 +22,6 @@ namespace Content.Shared.Standing return !standingState.Standing; } - [Obsolete("Use the EntityUid overloads instead.")] - public void Down(IEntity entity, bool playSound = true, bool dropHeldItems = true) - { - Down(entity.Uid, playSound, dropHeldItems); - } - public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true, StandingStateComponent? standingState = null, SharedAppearanceComponent? appearance = null, @@ -80,12 +68,6 @@ namespace Content.Shared.Standing return true; } - [Obsolete("Use the EntityUid overloads instead.")] - public void Stand(IEntity entity) - { - Stand(entity.Uid); - } - public bool Stand(EntityUid uid, StandingStateComponent? standingState = null, SharedAppearanceComponent? appearance = null) @@ -120,7 +102,6 @@ namespace Content.Shared.Standing /// public sealed class DownAttemptEvent : CancellableEntityEventArgs { - } /// @@ -128,7 +109,6 @@ namespace Content.Shared.Standing /// public sealed class StandAttemptEvent : CancellableEntityEventArgs { - } ///