From d2acbc97d765a9cf12d43677e2afe63c5d2a45af Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 10 Mar 2023 07:41:52 +0100 Subject: [PATCH] [MIRROR] Lowers nightvision threshold to work for mesons, fixes not being able to examine stuff lit by overlay lights [MDB IGNORE] (#19704) Lowers nightvision threshold to work for mesons, fixes not being able to examine stuff lit by overlay lights Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> --- code/__DEFINES/lighting.dm | 2 +- code/modules/mob/mob.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index 2a16d34a0cb..dc49595f740 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -44,7 +44,7 @@ #define LIGHTING_CUTOFF_FULLBRIGHT 100 /// What counts as being able to see in the dark -#define LIGHTING_NIGHTVISION_THRESHOLD 10 +#define LIGHTING_NIGHTVISION_THRESHOLD 7 /// The amount of lumcount on a tile for it to be considered dark (used to determine reading and nyctophobia) #define LIGHTING_TILE_IS_DARK 0.2 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 769bc08a212..66fef7d7bfb 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -549,7 +549,7 @@ if(is_blind()) //blind people see things differently (through touch) if(!blind_examine_check(examinify)) return - else if(!examine_turf.luminosity && \ + else if(!(examine_turf.luminosity || examine_turf.dynamic_lumcount) && \ get_dist(src, examine_turf) > 1 && \ !has_nightvision()) // If you aren't blind, it's in darkness (that you can't see) and farther then next to you return