Overcomplicates things

code/modules/client/preferences.dm

@@ -48,6 +48,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/uses_glasses_colour = 0
 	
 	var/screenshake = 1
+	var/damagescreenshake = 2
 
 	//character preferences
 	var/real_name						//our character's name
@@ -366,7 +367,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 			dat += "</a><br>"
 
-			dat += "<b>Screen shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake) ? "Full" : ((!screenshake) ? "None" : "Reduced")]</a><br>"
+			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>"
 
 			dat += "</td><td width='300px' height='300px' valign='top'>"
 
@@ -1501,6 +1504,16 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							screenshake = 0
 						else
 							screenshake = 1
+				if("damagescreenshake")
+					switch(damagescreenshake)
+						if(0)
+							damagescreenshake = 1
+						if(1)
+							damagescreenshake = 2
+						if(2)
+							damagescreenshake = 0
+						else
+							damagescreenshake = 1
 
 				if("publicity")
 					if(unlock_content)

code/modules/client/preferences_savefile.dm

@@ -191,6 +191,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//citadel code
 	S["arousable"]			>> arousable
 	S["screenshake"]		>> screenshake
+	S["damagescreenshake"]		>> damagescreenshake
 
 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -216,6 +217,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	menuoptions		= SANITIZE_LIST(menuoptions)
 	be_special		= SANITIZE_LIST(be_special)
 	screenshake			= sanitize_integer(screenshake, 0, 2, initial(screenshake))
+	damagescreenshake	= sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake))
 
 
 	return 1
@@ -259,6 +261,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//citadel code
 	S["arousable"]			<< arousable
 	WRITE_FILE(S["screenshake"], screenshake)
+	WRITE_FILE(S["damagescreenshake"], damagescreenshake)
 
 	return 1