From 054be386def1e0d302bbc8eee0111cbcfd0f4090 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 8 Aug 2018 12:39:19 +0200 Subject: [PATCH] readded defines; tweaked size --- code/__DEFINES/misc.dm | 5 +++++ code/_onclick/hud/plane_master.dm | 2 +- code/modules/mob/living/life.dm | 2 +- code/modules/mob/status_procs.dm | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 2456d7354f..992052b5f8 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -453,6 +453,11 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE)) // Used by PDA and cartridge code to reduce repetitiveness of spritesheets #define PDAIMG(what) {""} +//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"=4) +#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 #define GRAVITY_DAMAGE_TRESHOLD 3 //Starting with this value gravity will start to damage mobs diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm index 3c0b921820..b72dd948d7 100644 --- a/code/_onclick/hud/plane_master.dm +++ b/code/_onclick/hud/plane_master.dm @@ -30,7 +30,7 @@ /obj/screen/plane_master/game_world/backdrop(mob/mymob) if(istype(mymob) && mymob.client && mymob.client.prefs && mymob.client.prefs.ambientocclusion) - add_filter("ambient_occlusion", 0, list("type" = "drop_shadow", "x" = 0, "y" = -2, "size" = 4, "border" = 4, "color" = "#04080FAA")) + add_filter("ambient_occlusion", 0, AMBIENT_OCCLUSION) else remove_filter("ambient_occlusion") update_filters() diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index e821d9e7da..40b11c14ce 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -148,7 +148,7 @@ /mob/living/proc/gravity_animate() if(!get_filter("gravity")) - add_filter("gravity",1,list("type"="motion_blur", "x"=0, "y"=0)) + add_filter("gravity",1, GRAVITY_MOTION_BLUR) INVOKE_ASYNC(src, .proc/gravity_pulse_animation) /mob/living/proc/gravity_pulse_animation() diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index 1adc08ff91..f031f77351 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -228,8 +228,8 @@ /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, list("type"="blur", "size"=2)) - F.add_filter("blurry_eyes", 2, list("type"="blur", "size"=2)) + GW.add_filter("blurry_eyes", 2, EYE_BLUR) + F.add_filter("blurry_eyes", 2, EYE_BLUR) /mob/proc/remove_eyeblur() var/obj/screen/plane_master/game_world/GW = locate(/obj/screen/plane_master/game_world) in client.screen