Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes blindness and blurry vision #85

Closed
wants to merge 1 commit into from
Closed

Fixes blindness and blurry vision #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions code/modules/mob/living/carbon/human/species/species.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,23 +409,29 @@ The slots that you can use are found in items_clothing.dm and are the inventory
if(!H.client)//no client, no screen to update
return 1

//H.set_fullscreen(H.eye_blind && !H.equipment_prescription, "blind", /obj/screen/fullscreen/blind)
H.set_fullscreen(H.eye_blind && !H.equipment_prescription, "blind", /obj/screen/fullscreen/blind)

/*
This piece of code breaking mob's FOV.
if(H.eye_blind && !H.equipment_prescription)
H.set_all_blur()
else
H.remove_all_blur()

*/
H.set_fullscreen(H.stat == UNCONSCIOUS, "blackout", /obj/screen/fullscreen/blackout)

//if(config.welder_vision)
// H.set_fullscreen(H.equipment_tint_total, "welder", /obj/screen/fullscreen/impaired, H.equipment_tint_total)
var/how_nearsighted = get_how_nearsighted(H)
H.set_fullscreen(how_nearsighted, "nearsighted", /obj/screen/fullscreen/oxy, how_nearsighted)
//H.set_fullscreen(H.eye_blurry, "blurry", /obj/screen/fullscreen/blurry)
H.set_fullscreen(H.eye_blurry, "blurry", /obj/screen/fullscreen/blurry)

/* This one too.
if(H.eye_blurry)
H.set_all_blur()
else
H.remove_all_blur()
*/
H.set_fullscreen(H.druggy, "high", /obj/screen/fullscreen/high)

for(var/overlay in H.equipment_overlays)
Expand Down
9 changes: 8 additions & 1 deletion code/modules/mob/living/life.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,13 @@

return 1

//I hate this with a burning passion.
/*
I hate this with a burning passion.


If you want this cool blur effect you can uncomment this, but be aware of the weird glitch - blured icons of mobs will not be masked by vision_cone.
Blur filter(or any other filter) somehow interferes alpha mask filter on the same plane.

/mob/living/proc/set_all_blur()
if(!client)
return
Expand Down Expand Up @@ -215,6 +221,7 @@
client.screen -= plating_blur
client.screen -= AT
client.screen -= AOB
*/

/mob/living/proc/handle_vision()
update_sight()
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/living_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@
var/datum/trait/trait = null
var/fast_stripper = FALSE //whether or not you can turbostrip

/*
//This is for the screen. Yes I hate this. Yes I know it needs a refactor. No I don't care at the moment.
//
//Comment this out until better times.
var/obj/screen/plane_master/blur/human_blur/HB = new
var/obj/screen/plane_master/blur/turf_blur/TB = new
var/obj/screen/plane_master/blur/wall_blur/WB = new
Expand All @@ -75,3 +78,4 @@
var/obj/screen/plane_master/blur/effects_blur/EB = new
var/obj/screen/plane_master/blur/plating_blur/plating_blur = new
var/obj/screen/plane_master/blur/above_obj_blur/AOB = new
*/