From 4e793a5630d1c32948018f52e3b9eb6e5fd67b80 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 23 Sep 2017 13:17:21 -0400 Subject: [PATCH] Should work --- code/modules/client/preferences.dm | 2 +- modular_citadel/cit_screenshake.dm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 92551d485d..d40c4ea87c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -366,7 +366,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "High" dat += "
" - dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : [screenshake])]
" + dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]
" if (!user.client.prefs.screenshake==0) dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
" diff --git a/modular_citadel/cit_screenshake.dm b/modular_citadel/cit_screenshake.dm index 8bdc4003ab..2d0110c4e7 100644 --- a/modular_citadel/cit_screenshake.dm +++ b/modular_citadel/cit_screenshake.dm @@ -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)