From cc4b615717771e7bcfa1ce3539c616b76cf6a389 Mon Sep 17 00:00:00 2001 From: drdth Date: Tue, 14 Jan 2025 16:41:39 +0300 Subject: [PATCH] fix: fix strange things happening on second crit --- .../_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs | 5 ++--- .../_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) rename {Content.Shared => Content.Server}/_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs (68%) rename {Content.Shared => Content.Server}/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs (80%) diff --git a/Content.Shared/_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs b/Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs similarity index 68% rename from Content.Shared/_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs rename to Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs index 6a01af9fdf8..fb2f037d5ff 100644 --- a/Content.Shared/_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs +++ b/Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatComponent.cs @@ -1,9 +1,8 @@ using Robust.Shared.Audio; -using Robust.Shared.GameStates; -namespace Content.Shared._Sunrise.CritHeartbeat; +namespace Content.Server._Sunrise.CritHeartbeat; -[RegisterComponent, NetworkedComponent] +[RegisterComponent] public sealed partial class CritHeartbeatComponent : Component { [DataField] diff --git a/Content.Shared/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs b/Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs similarity index 80% rename from Content.Shared/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs rename to Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs index f45183ef4f6..bf8bed50981 100644 --- a/Content.Shared/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs +++ b/Content.Server/_Sunrise/CritHeartbeat/CritHeartbeatSystem.cs @@ -1,12 +1,11 @@ using Content.Shared.Mobs; +using Robust.Server.Audio; using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; - -namespace Content.Shared._Sunrise.CritHeartbeat; +namespace Content.Server._Sunrise.CritHeartbeat; public sealed class CritHeartbeatSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly AudioSystem _audio = default!; public override void Initialize() {