From d9f77802d15752c5e64020e4f97054bbbe30685b Mon Sep 17 00:00:00 2001
From: FN <37689533+FireNameFN@users.noreply.github.com>
Date: Sun, 29 Dec 2024 08:44:15 +0700
Subject: [PATCH] Revert "NoScope 360 AWP kill"

---
 Content.Shared/CombatMode/CombatModeComponent.cs   | 14 --------------
 .../CombatMode/SharedCombatModeSystem.cs           |  9 +--------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/Content.Shared/CombatMode/CombatModeComponent.cs b/Content.Shared/CombatMode/CombatModeComponent.cs
index b26830ad580..124a682d5c7 100644
--- a/Content.Shared/CombatMode/CombatModeComponent.cs
+++ b/Content.Shared/CombatMode/CombatModeComponent.cs
@@ -48,19 +48,5 @@ public sealed partial class CombatModeComponent : Component
         /// </summary>
         [DataField, AutoNetworkedField]
         public bool ToggleMouseRotator = true;
-
-        // Corvax-Next-NoScope-Start
-        /// <summary>
-        ///     If true, sets <see cref="MouseRotatorComponent.AngleTolerance"/> to 1 degree and <see cref="MouseRotatorComponent.Simple4DirMode"/>
-        ///     to false when the owner enters combatmode. This is currently being tested as of 06.12.24,
-        ///     so a simple bool switch should suffice.
-        ///     Leaving AutoNetworking just in case shitmins need to disable it for someone. Will only take effect when re-enabling combat mode.
-        /// </summary>
-        /// <remarks>
-        ///     No effect if <see cref="ToggleMouseRotator"/> is false.
-        /// </remarks>
-        [DataField, AutoNetworkedField]
-        public bool SmoothRotation = true;
-        // Corvax-Next-NoScope-End
     }
 }
diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 134fae45867..5eed8ee2423 100644
--- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -94,14 +94,7 @@ private void SetMouseRotatorComponents(EntityUid uid, bool value)
     {
         if (value)
         {
-            // Corvax-Next-NoScope-Start
-            var rot = EnsureComp<MouseRotatorComponent>(uid);
-            if (TryComp<CombatModeComponent>(uid, out var comp) && comp.SmoothRotation) // no idea under which (intended) circumstances this can fail (if any), so i'll avoid Comp<>().
-            {
-                rot.AngleTolerance = Angle.FromDegrees(1); // arbitrary
-                rot.Simple4DirMode = false;
-            }
-            // Corvax-Next-NoScope-End
+            EnsureComp<MouseRotatorComponent>(uid);
             EnsureComp<NoRotateOnMoveComponent>(uid);
         }
         else