From ebaf5ab6a144e0db84fb33ac579599d07950c6bf Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 16 Nov 2018 17:46:33 -0500
Subject: [PATCH] Makes the eyeblur effect scale depending on how much eyeblur
 you have (#7727)

---
 code/__DEFINES/misc.dm           |  2 +-
 code/modules/mob/living/life.dm  |  7 +++++--
 code/modules/mob/status_procs.dm | 14 ++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 8493676542..0cc1131df2 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -459,7 +459,7 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 
 //Filters
 #define AMBIENT_OCCLUSION list("type"="drop_shadow","x"=0,"y"=-2,"size"=4,"border"=4,"color"="#04080FAA")
-#define EYE_BLUR list("type"="blur", "size"=3)
+#define EYE_BLUR(size) list("type"="blur", "size"=size)
 #define GRAVITY_MOTION_BLUR list("type"="motion_blur","x"=0,"y"=0)
 
 #define STANDARD_GRAVITY 1 //Anything above this is high gravity, anything below no grav
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index c55252ddb6..9ef4c1567a 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -135,8 +135,11 @@
 			eye_blind = max(eye_blind-1,1)
 	else if(eye_blurry)			//blurry eyes heal slowly
 		eye_blurry = max(eye_blurry-1, 0)
-		if(client && !eye_blurry)
-			remove_eyeblur()
+		if(client)
+			if(!eye_blurry)
+				remove_eyeblur()
+			else
+				update_eyeblur()
 
 /mob/living/proc/update_damage_hud()
 	return
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index 181a692831..6841534b0e 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -206,6 +206,8 @@
 		eye_blurry = max(amount, eye_blurry)
 		if(!old_eye_blurry)
 			add_eyeblur() //Citadel edit blurry eye memes entailed. syncs beware
+		else if(eye_blurry > 0)
+			update_eyeblur()
 
 /mob/proc/adjust_blurriness(amount)
 	var/old_eye_blurry = eye_blurry
@@ -213,6 +215,8 @@
 	if(amount>0)
 		if(!old_eye_blurry)
 			add_eyeblur()
+	else if(eye_blurry > 0)
+		update_eyeblur()
 	else if(old_eye_blurry && !eye_blurry)
 		remove_eyeblur()
 
@@ -222,14 +226,20 @@
 	if(amount>0)
 		if(!old_eye_blurry)
 			add_eyeblur()
+	else if(eye_blurry > 0)
+		update_eyeblur()
 	else if(old_eye_blurry)
 		remove_eyeblur()
 
 /mob/proc/add_eyeblur()
 	var/obj/screen/plane_master/game_world/GW = locate(/obj/screen/plane_master/game_world) in client.screen
 	var/obj/screen/plane_master/floor/F = locate(/obj/screen/plane_master/floor) in client.screen
-	GW.add_filter("blurry_eyes", 2, EYE_BLUR)
-	F.add_filter("blurry_eyes", 2, EYE_BLUR)
+	GW.add_filter("blurry_eyes", 2, EYE_BLUR(CLAMP(eye_blurry*0.1,0.6,3)))
+	F.add_filter("blurry_eyes", 2, EYE_BLUR(CLAMP(eye_blurry*0.1,0.6,3)))
+
+/mob/proc/update_eyeblur()
+	remove_eyeblur()
+	add_eyeblur()
 
 /mob/proc/remove_eyeblur()
 	var/obj/screen/plane_master/game_world/GW = locate(/obj/screen/plane_master/game_world) in client.screen