diff --git a/Content.Client/Camera/CameraRecoilSystem.cs b/Content.Client/Camera/CameraRecoilSystem.cs
index 3e04cd5bf1..d11884debd 100644
--- a/Content.Client/Camera/CameraRecoilSystem.cs
+++ b/Content.Client/Camera/CameraRecoilSystem.cs
@@ -21,7 +21,7 @@ public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
private void OnCvarChanged(float value)
{
- _intensity = value;
+ _intensity = Math.Max(0.2f, value); // Fish-Edit
}
private void OnCameraKick(CameraKickEvent ev)
@@ -31,8 +31,8 @@ public sealed class CameraRecoilSystem : SharedCameraRecoilSystem
public override void KickCamera(EntityUid uid, Vector2 recoil, CameraRecoilComponent? component = null)
{
- if (_intensity == 0)
- return;
+ if (_intensity < 0.2f) // Fish-Edit
+ _intensity = 0.2f; // Fish-Edit
if (!Resolve(uid, ref component, false))
return;
diff --git a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
index 3b0c1e3069..c124cda0da 100644
--- a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
@@ -9,7 +9,7 @@
- <-->
+
diff --git a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
index b8025317a5..05b61ba0b5 100644
--- a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml.cs
@@ -15,6 +15,7 @@ public sealed partial class AccessibilityTab : Control
Control.AddOptionCheckBox(CCVars.ChatEnableColorName, EnableColorNameCheckBox);
Control.AddOptionCheckBox(CCVars.AccessibilityColorblindFriendly, ColorblindFriendlyCheckBox);
Control.AddOptionCheckBox(CCVars.ReducedMotion, ReducedMotionCheckBox);
+ Control.AddOptionPercentSlider(CCVars.ScreenShakeIntensity, ScreenShakeIntensitySlider, min: 0.2f); // Fish-Edit
Control.AddOptionPercentSlider(CCVars.ChatWindowOpacity, ChatWindowOpacitySlider);
Control.AddOptionPercentSlider(CCVars.SpeechBubbleTextOpacity, SpeechBubbleTextOpacitySlider);
Control.AddOptionPercentSlider(CCVars.SpeechBubbleSpeakerOpacity, SpeechBubbleSpeakerOpacitySlider);
diff --git a/Content.Shared/CCVar/CCVars.Accessibility.cs b/Content.Shared/CCVar/CCVars.Accessibility.cs
index 6a9947e273..8cd8b0873f 100644
--- a/Content.Shared/CCVar/CCVars.Accessibility.cs
+++ b/Content.Shared/CCVar/CCVars.Accessibility.cs
@@ -27,10 +27,10 @@ public sealed partial class CCVars
///
/// Screen shake intensity slider, controlling the intensity of the CameraRecoilSystem.
- /// Goes from 0 (no recoil at all) to 1 (regular amounts of recoil)
+ /// Goes from 0.2 (20% minimum) to 1 (regular amounts of recoil) // Fish-Edit
///
public static readonly CVarDef ScreenShakeIntensity =
- CVarDef.Create("accessibility.screen_shake_intensity", 0.5f, CVar.REPLICATED | CVar.SERVER);
+ CVarDef.Create("accessibility.screen_shake_intensity", 0.5f, CVar.CLIENTONLY | CVar.ARCHIVE);
///
/// A generic toggle for various visual effects that are color sensitive.