This is a temporary measure and will be reverted once the DMCA counterclaim process is completed.

Content.Client/Buckle/BuckleSystem.cs

@@ -58,11 +58,17 @@ private void OnStrapMoveEvent(EntityUid uid, StrapComponent component, ref MoveE
 
     private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
     {
-        if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals)
-            || !Appearance.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var buckled, args.Component)
-            || !buckled || args.Sprite == null)
+        if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals))
             return;
 
+        if (!Appearance.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var buckled, args.Component) ||
+            !buckled ||
+            args.Sprite == null)
+        {
+            _rotationVisualizerSystem.SetHorizontalAngle((uid, rotVisuals), rotVisuals.DefaultRotation);
+            return;
+        }
+
         // Animate strapping yourself to something at a given angle
         // TODO: Dump this when buckle is better
         _rotationVisualizerSystem.AnimateSpriteRotation(uid, args.Sprite, rotVisuals.HorizontalRotation, 0.125f);

Content.Client/Input/ContentContexts.cs

@@ -85,11 +85,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
 
-            // Sunrise
-            human.AddFunction(ContentKeyFunctions.ToggleStanding);
-            human.AddFunction(ContentKeyFunctions.LookUp);
-            // Sunrise
-
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);
 

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -98,20 +98,6 @@ private void HandleToggleWalk(BaseButton.ButtonToggledEventArgs args)
             _deferCommands.Add(_inputManager.SaveToUserData);
         }
 
-        // Sunrise
-        private void HandleHoldLookUp(BaseButton.ButtonToggledEventArgs args)
-        {
-            _cfg.SetCVar(SunriseCCVars.HoldLookUp, args.Pressed);
-            _cfg.SaveToFile();
-        }
-
-        private void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args)
-        {
-            _cfg.SetCVar(SunriseCCVars.AutoGetUp, args.Pressed);
-            _cfg.SaveToFile();
-        }
-        // Sunrise
-
         private void HandleStaticStorageUI(BaseButton.ButtonToggledEventArgs args)
         {
             _cfg.SetCVar(CCVars.StaticStorageUI, args.Pressed);
@@ -200,13 +186,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.RotateStoredItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);
 
-            // Sunrise
-            AddButton(ContentKeyFunctions.ToggleStanding);
-            AddButton(ContentKeyFunctions.LookUp);
-            AddCheckBox("ui-options-function-auto-get-up", _cfg.GetCVar(SunriseCCVars.AutoGetUp), HandleToggleAutoGetUp);
-            AddCheckBox("ui-options-function-hold-look-up", _cfg.GetCVar(SunriseCCVars.HoldLookUp), HandleHoldLookUp);
-            // Sunrise
-
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);
             AddButton(ContentKeyFunctions.SmartEquipBelt);

Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs

@@ -202,7 +202,6 @@ private void UpdateRanged(float frameTime)
                 return;
             }
 
-            _gun.SetTarget(gun, comp.Target);
             _gun.AttemptShoot(uid, gunUid, gun, targetCordinates);
         }
     }

Content.Server/_Sunrise/Footprints/FootPrintsSystem.cs

@@ -5,7 +5,6 @@
 using Content.Shared.Inventory;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
-using Content.Shared.Standing;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 using System.Linq;
@@ -78,9 +77,7 @@ private void OnEntityMove(EntityUid uid, FootprintEmitterComponent emitter, ref
             return;
 
         var isBeingDragged =
-            mobState.CurrentThresholdState is MobState.Critical or MobState.Dead ||
-            (TryComp<StandingStateComponent>(uid, out var stateComponent) &&
-             stateComponent.CurrentState is StandingState.Lying);
+            mobState.CurrentThresholdState is MobState.Critical or MobState.Dead;
 
         var distanceMoved = (transform.LocalPosition - emitter.LastStepPosition).Length();
         var requiredDistance = isBeingDragged ? emitter.DragMarkInterval : emitter.WalkStepInterval;

Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs

@@ -380,7 +380,7 @@ private void Buckle(Entity<BuckleComponent> buckle, Entity<StrapComponent> strap
                 _standing.Stand(buckle, force: true);
                 break;
             case StrapPosition.Down:
-                _standing.Down(buckle, false, false, force:true);
+                _standing.Down(buckle, false, false, force: true);
                 break;
         }
 

Content.Shared/Camera/SharedCameraRecoilSystem.cs

@@ -1,7 +1,4 @@
 using System.Numerics;
-using Content.Shared.Hands.EntitySystems;
-using Content.Shared.Item;
-using Content.Shared.Telescope;
 using JetBrains.Annotations;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
@@ -33,7 +30,6 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
 
     [Dependency] private readonly SharedEyeSystem _eye = default!;
     [Dependency] private readonly INetManager _net = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
 
 
     public override void Initialize()
@@ -43,14 +39,7 @@ public override void Initialize()
 
     private void OnCameraRecoilGetEyeOffset(Entity<CameraRecoilComponent> ent, ref GetEyeOffsetEvent args)
     {
-        if (_hands.TryGetActiveItem(ent.Owner, out var item) && HasComp<TelescopeComponent>(item.Value))
-        {
-            args.Offset += ent.Comp.BaseOffset;
-        }
-        else
-        {
-            args.Offset += ent.Comp.BaseOffset + ent.Comp.CurrentKick;
-        }
+        args.Offset += ent.Comp.BaseOffset + ent.Comp.CurrentKick;
     }
 
     /// <summary>

Content.Shared/Input/ContentKeyFunctions.cs

@@ -61,11 +61,6 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ZoomIn = "ZoomIn";
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
 
-        // Sunrise
-        public static readonly BoundKeyFunction ToggleStanding = "ToggleStanding";
-        public static readonly BoundKeyFunction LookUp = "LookUp";
-        // Sunrise
-
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";
         public static readonly BoundKeyFunction ArcadeLeft = "ArcadeLeft";