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

Makes the eyeblur effect scale depending on how much eyeblur you have (#7727)

Browse Source
This commit is contained in:
deathride58
2018-11-16 17:46:33 -05:00
committed by kevinz000
parent a01341d358
commit ebaf5ab6a1
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/misc.dm
+1 -1
View File
@@ -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
code/modules/mob/living/life.dm
+5 -2
View File
@@ -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
code/modules/mob/status_procs.dm
+12 -2
View File
@@ -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