Merge pull request #14531 from FlattestGuitar/eyes-wide-blurred

Blurry eyes blur eyes
This commit is contained in:
AffectedArc07
2020-10-06 08:34:11 +01:00
committed by GitHub
5 changed files with 39 additions and 17 deletions
@@ -2113,9 +2113,9 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
toggles ^= AMBIENT_OCCLUSION
if(parent && parent.screen && parent.screen.len)
var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
PM.filters -= FILTER_AMBIENT_OCCLUSION
PM.remove_filter(AMBIENT_OCCLUSION_FILTER_KEY)
if(toggles & AMBIENT_OCCLUSION)
PM.filters += FILTER_AMBIENT_OCCLUSION
PM.add_filter(AMBIENT_OCCLUSION_FILTER_KEY, FILTER_AMBIENT_OCCLUSION)
if("parallax")
var/parallax_styles = list(
+18 -2
View File
@@ -10,10 +10,10 @@
/mob/living/update_blurry_effects()
if(eyes_blurred())
overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
add_eyeblur()
return 1
else
clear_fullscreen("blurry")
remove_eyeblur()
return 0
/mob/living/update_druggy_effects()
@@ -133,3 +133,19 @@
updatehealth("var edit")
if("resize")
update_transform()
/mob/proc/add_eyeblur()
if(client.screen)
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(EYE_BLUR_FILTER_KEY, FILTER_EYE_BLUR)
F.add_filter(EYE_BLUR_FILTER_KEY, FILTER_EYE_BLUR)
animate(GW.filters[GW.filters.len], size = 3, time = 5)
animate(F.filters[F.filters.len], size = 3, time = 5)
/mob/proc/remove_eyeblur()
if(client.screen)
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.remove_filter(EYE_BLUR_FILTER_KEY)
F.remove_filter(EYE_BLUR_FILTER_KEY)