From 91e5dbe0f380c947fa31652c9e669139d1de27c9 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 3 Sep 2017 18:54:25 -0400 Subject: [PATCH] "only when down" should now work --- modular_citadel/cit_screenshake.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modular_citadel/cit_screenshake.dm b/modular_citadel/cit_screenshake.dm index bfaaf61028..e4e3c81078 100644 --- a/modular_citadel/cit_screenshake.dm +++ b/modular_citadel/cit_screenshake.dm @@ -52,14 +52,15 @@ /obj/item/attack(mob/living/M, mob/living/user) . = ..() - if(force && force >=11) + if(force && force >=15) shake_camera(user, ((force - 10) * 0.01 + 1), ((force - 10) * 0.01)) if(M.client.prefs) switch (M.client.prefs.damagescreenshake) if (1) shake_camera(M, ((force - 10) * 0.015 + 1), ((force - 10) * 0.015)) - if (2)//setting is "only when down." check for knockdown status before applying this. - shake_camera(M, ((force - 10) * 0.015 + 1), ((force - 10) * 0.015)) + if (2) + if (M.IsKnockdown) + shake_camera(M, ((force - 10) * 0.015 + 1), ((force - 10) * 0.015)) /obj/item/attack_obj(obj/O, mob/living/user) . = ..()