From bfc9aba71011a25679689b57100d899150f301c9 Mon Sep 17 00:00:00 2001
From: deathride58 <wyattbogle1@gmail.com>
Date: Sun, 3 Sep 2017 20:12:23 -0400
Subject: [PATCH] damage screen shake will no longer show when screen shake is
 disabled

---
 code/modules/client/preferences.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index e94203121b..f8909b8f4a 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -369,7 +369,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 			dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==1) ? "Full" : ((screenshake==0) ? "None" : "Reduced")]</a><br>"
 
-			dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
+			if (!user.client.prefs.screenshake==0)
+				dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
 
 			dat += "</td><td width='300px' height='300px' valign='top'>"