diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs index f1697b820d..ae9c7eda78 100644 --- a/Content.Client/Doors/DoorSystem.cs +++ b/Content.Client/Doors/DoorSystem.cs @@ -31,7 +31,7 @@ public sealed class DoorSystem : SharedDoorSystem comp.OpeningAnimation = new Animation { - Length = TimeSpan.FromSeconds(comp.OpeningAnimationTime), + Length = comp.OpeningAnimationTime, AnimationTracks = { new AnimationTrackSpriteFlick @@ -47,7 +47,7 @@ public sealed class DoorSystem : SharedDoorSystem comp.ClosingAnimation = new Animation { - Length = TimeSpan.FromSeconds(comp.ClosingAnimationTime), + Length = comp.ClosingAnimationTime, AnimationTracks = { new AnimationTrackSpriteFlick @@ -63,7 +63,7 @@ public sealed class DoorSystem : SharedDoorSystem comp.EmaggingAnimation = new Animation { - Length = TimeSpan.FromSeconds(comp.EmaggingAnimationTime), + Length = comp.EmaggingAnimationTime, AnimationTracks = { new AnimationTrackSpriteFlick @@ -116,14 +116,14 @@ public sealed class DoorSystem : SharedDoorSystem return; case DoorState.Opening: - if (entity.Comp.OpeningAnimationTime == 0.0) + if (entity.Comp.OpeningAnimationTime == TimeSpan.Zero) return; _animationSystem.Play(entity, (Animation)entity.Comp.OpeningAnimation, DoorComponent.AnimationKey); return; case DoorState.Closing: - if (entity.Comp.ClosingAnimationTime == 0.0 || entity.Comp.CurrentlyCrushing.Count != 0) + if (entity.Comp.ClosingAnimationTime == TimeSpan.Zero || entity.Comp.CurrentlyCrushing.Count != 0) return; _animationSystem.Play(entity, (Animation)entity.Comp.ClosingAnimation, DoorComponent.AnimationKey); diff --git a/Content.Shared/Doors/Components/DoorComponent.cs b/Content.Shared/Doors/Components/DoorComponent.cs index e413f472e0..020a7a4c9b 100644 --- a/Content.Shared/Doors/Components/DoorComponent.cs +++ b/Content.Shared/Doors/Components/DoorComponent.cs @@ -187,22 +187,22 @@ public sealed partial class DoorComponent : Component public string EmaggingSpriteState = "sparks"; /// - /// The sprite state used for the door when it's open. + /// The length of the door's opening animation. /// [DataField] - public float OpeningAnimationTime = 0.8f; + public TimeSpan OpeningAnimationTime = TimeSpan.FromSeconds(0.8); /// - /// The sprite state used for the door when it's open. + /// The length of the door's closing animation. /// [DataField] - public float ClosingAnimationTime = 0.8f; + public TimeSpan ClosingAnimationTime = TimeSpan.FromSeconds(0.8); /// - /// The sprite state used for the door when it's open. + /// The length of the door's emagging animation. /// [DataField] - public float EmaggingAnimationTime = 1.5f; + public TimeSpan EmaggingAnimationTime = TimeSpan.FromSeconds(1.5); /// /// The animation used when the door opens.