shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Should work

Browse Source
This commit is contained in:
deathride58
2017-09-23 13:17:21 -04:00
parent 20700dab57
commit 4e793a5630
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -1
View File
@@ -366,7 +366,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "High"
dat += "</a><br>"
dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : [screenshake])]</a><br>"
dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</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>"
modular_citadel/cit_screenshake.dm
+3 -2
View File
@@ -8,8 +8,9 @@
return
var/oldx = C.pixel_x
var/oldy = C.pixel_y
var/max = ((C.prefs.screenshake==1) ? strength : strength*0.25) *world.icon_size
var/min = -(((C.prefs.screenshake==1) ? strength : strength*0.25)*world.icon_size)
var/clientscreenshake = (C.prefs.screenshake * 0.01)
var/max = (strength*clientscreenshake) * world.icon_size
var/min = -((strength*clientscreenshake) * world.icon_size)
for(var/i in 0 to duration-1)
if (i == 0)