Blurry eyes just got blurrier

This commit is contained in:
Unknown
2018-08-08 11:24:21 +02:00
parent 64e0a494cb
commit 9ca7e38f7a
7 changed files with 29 additions and 17 deletions
-3
View File
@@ -453,9 +453,6 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
// Used by PDA and cartridge code to reduce repetitiveness of spritesheets
#define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}
//Filters
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, border=4, color="#04080FAA")
#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
-5
View File
@@ -123,11 +123,6 @@
/obj/screen/fullscreen/impaired
icon_state = "impairedoverlay"
/obj/screen/fullscreen/blurry
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "blurry"
/obj/screen/fullscreen/flash
icon = 'icons/mob/screen_gen.dmi'
screen_loc = "WEST,SOUTH to EAST,NORTH"
+4 -2
View File
@@ -29,9 +29,11 @@
blend_mode = BLEND_OVERLAY
/obj/screen/plane_master/game_world/backdrop(mob/mymob)
filters = list()
if(istype(mymob) && mymob.client && mymob.client.prefs && mymob.client.prefs.ambientocclusion)
filters += AMBIENT_OCCLUSION
add_filter("ambient_occlusion", 0, list("type" = "drop_shadow", "x" = 0, "y" = -2, "size" = 4, "border" = 4, "color" = "#04080FAA"))
else
remove_filter("ambient_occlusion")
update_filters()
/obj/screen/plane_master/lighting
name = "lighting plane master"
+7 -1
View File
@@ -608,4 +608,10 @@
/atom/movable/proc/get_filter(name)
if(filter_data && filter_data[name])
return filters[filter_data.Find(name)]
return filters[filter_data.Find(name)]
/atom/movable/proc/remove_filter(name)
if(filter_data[name])
filter_data -= name
update_filters()
return TRUE
+1 -1
View File
@@ -133,7 +133,7 @@
else if(eye_blurry) //blurry eyes heal slowly
eye_blurry = max(eye_blurry-1, 0)
if(client && !eye_blurry)
clear_fullscreen("blurry")
remove_eyeblur()
/mob/living/proc/update_damage_hud()
return
+17 -5
View File
@@ -205,25 +205,37 @@
var/old_eye_blurry = eye_blurry
eye_blurry = max(amount, eye_blurry)
if(!old_eye_blurry)
overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
add_eyeblur()
/mob/proc/adjust_blurriness(amount)
var/old_eye_blurry = eye_blurry
eye_blurry = max(eye_blurry+amount, 0)
if(amount>0)
if(!old_eye_blurry)
overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
add_eyeblur()
else if(old_eye_blurry && !eye_blurry)
clear_fullscreen("blurry")
remove_eyeblur()
/mob/proc/set_blurriness(amount)
var/old_eye_blurry = eye_blurry
eye_blurry = max(amount, 0)
if(amount>0)
if(!old_eye_blurry)
overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
add_eyeblur()
else if(old_eye_blurry)
clear_fullscreen("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, list("type"="blur", "size"=2))
F.add_filter("blurry_eyes", 2, list("type"="blur", "size"=2))
/mob/proc/remove_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.remove_filter("blurry_eyes")
F.remove_filter("blurry_eyes")
/////////////////////////////////// DRUGGY ////////////////////////////////////
Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 118 KiB