Nearsighted Camera Fix (#17124)

* Nearsighted Camera Fix

* fluffy changes
This commit is contained in:
Geeves
2023-09-09 14:20:56 +02:00
committed by GitHub
parent 67c03110c1
commit 4c7e9e4ff2
10 changed files with 55 additions and 5 deletions
@@ -47,7 +47,7 @@
return
..()
/mob/living/carbon/human/proc/update_equipment_vision()
/mob/living/carbon/human/proc/update_equipment_vision(var/machine_grants_equipment_vision = FALSE)
flash_protection = 0
equipment_tint_total = 0
equipment_see_invis = 0
@@ -62,7 +62,7 @@
else
binoc_check = TRUE
if(((!client || client.eye == src || client.eye == loc || client.eye == z_eye) && binoc_check) || HAS_TRAIT(src, TRAIT_COMPUTER_VIEW)) // !client is so the unit tests function
if(((!client || client.eye == src || client.eye == loc || client.eye == z_eye) && binoc_check) || machine_grants_equipment_vision || HAS_TRAIT(src, TRAIT_COMPUTER_VIEW)) // !client is so the unit tests function
if(istype(src.head, /obj/item/clothing/head))
add_clothing_protection(head)
if(istype(src.glasses, /obj/item/clothing/glasses))
+3 -1
View File
@@ -1398,12 +1398,14 @@
/mob/living/carbon/human/handle_vision()
if(client)
client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask, global_hud.nvg, global_hud.thermal, global_hud.meson, global_hud.science)
var/machine_has_equipment_vision = FALSE
if(machine)
var/viewflags = machine.check_eye(src)
if(viewflags < 0)
reset_view(null, 0)
else if(viewflags)
set_sight(sight, viewflags)
machine_has_equipment_vision = machine.grants_equipment_vision(src)
else if(eyeobj)
if(eyeobj.owner != src)
reset_view(null)
@@ -1418,7 +1420,7 @@
remoteview_target = null
reset_view(null, 0)
update_equipment_vision()
update_equipment_vision(machine_has_equipment_vision)
species.handle_vision(src)
/mob/living/carbon/human/handle_hearing()