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

Merge pull request #7441 from FlattestGuitar/blur

Browse Source 
Blurry eyes just got blurrier
This commit is contained in:
deathride58
2018-08-12 20:38:50 -04:00
committed by GitHub
parent 9dfc0eeb87 99e1852493
commit 21c07e6f97
7 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/life.dm
+2 -2
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
@@ -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()
code/modules/mob/status_procs.dm
+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, 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
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 ////////////////////////////////////