From c22f4a044de4df8101c3d7f3d2ba37f8eac5b492 Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 5 Oct 2017 09:13:41 +1300 Subject: [PATCH 1/2] Merge pull request #31238 from AnturK/specialeyes Space vision fix V2.0 - GAME_PLANE change --- code/__DEFINES/layers.dm | 3 ++- code/modules/surgery/organs/eyes.dm | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 35b70bdb84..d33eaa35da 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -6,7 +6,8 @@ #define PLANE_SPACE -95 #define PLANE_SPACE_PARALLAX -90 -#define GAME_PLANE 0 +#define GAME_PLANE -1 +#define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals #define SPACE_LAYER 1.8 #define ABOVE_SPACE_LAYER 1.9 //#define TURF_LAYER 2 //For easy recordkeeping; this is a byond define diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 4b939bf4f1..3b83dd8e62 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -44,9 +44,11 @@ see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE actions_types = list(/datum/action/item_action/organ_action/use) + sight_flags = SEE_BLACKNESS var/night_vision = TRUE /obj/item/organ/eyes/night_vision/ui_action_click() + sight_flags = initial(sight_flags) switch(lighting_alpha) if (LIGHTING_PLANE_ALPHA_VISIBLE) lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE @@ -56,6 +58,7 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE else lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE + sight_flags &= ~SEE_BLACKNESS owner.update_sight() /obj/item/organ/eyes/night_vision/alien