diff --git a/Content.Client/PDA/Ringer/RingerSystem.cs b/Content.Client/PDA/Ringer/RingerSystem.cs index 6d45a8ce8b..6e2bb043ca 100644 --- a/Content.Client/PDA/Ringer/RingerSystem.cs +++ b/Content.Client/PDA/Ringer/RingerSystem.cs @@ -33,24 +33,4 @@ public sealed class RingerSystem : SharedRingerSystem bui.Update(); } } - - /// - public override bool TryToggleUplink(EntityUid uid, Note[] ringtone, EntityUid? user = null) - { - if (!TryComp(uid, out var uplink)) - return false; - - if (!HasComp(uid)) - return false; - - // Special case for client-side prediction: - // Since we can't expose the uplink code to clients for security reasons, - // we assume if an antagonist is trying to set a ringtone, it's to unlock the uplink. - // The server will properly verify the code and correct if needed. - if (IsAntagonist(user)) - return ToggleUplinkInternal((uid, uplink)); - - // Non-antagonists never get to toggle the uplink on the client - return false; - } } diff --git a/Content.Shared/PDA/SharedRingerSystem.cs b/Content.Shared/PDA/SharedRingerSystem.cs index 278ab94307..0fa5a570aa 100644 --- a/Content.Shared/PDA/SharedRingerSystem.cs +++ b/Content.Shared/PDA/SharedRingerSystem.cs @@ -145,16 +145,18 @@ public abstract class SharedRingerSystem : EntitySystem /// /// Attempts to unlock or lock the uplink by checking the provided ringtone against the uplink code. - /// On the client side, for antagonists, the code check is skipped to support prediction. - /// On the server side, the code is always verified. + /// On the client side, it does nothing since the client cannot know the code in advance. + /// On the server side, the code is verified. /// /// The entity with the RingerUplinkComponent. /// The ringtone to check against the uplink code. - /// The entity attempting to toggle the uplink. If the user is an antagonist, - /// the ringtone code check will be skipped on the client to allow prediction. + /// The entity attempting to toggle the uplink. /// True if the uplink state was toggled, false otherwise. [PublicAPI] - public abstract bool TryToggleUplink(EntityUid uid, Note[] ringtone, EntityUid? user = null); + public virtual bool TryToggleUplink(EntityUid uid, Note[] ringtone, EntityUid? user = null) + { + return false; + } #endregion