From d123df4b980e0fe2ed80d069e698fed9fddefd8f Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Fri, 12 Sep 2014 13:59:54 +0200
Subject: [PATCH] Fixes #6311

---
 code/modules/mob/living/carbon/human/life.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 106ba57a68..337bf4befb 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1383,7 +1383,9 @@
 					see_invisible = SEE_INVISIBLE_LIVING
 					seer = 0
 
+			var/tmp/has_ninja_mask = 0
 			if(istype(wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
+				has_ninja_mask = 1
 				var/obj/item/clothing/mask/gas/voice/space_ninja/O = wear_mask
 				switch(O.mode)
 					if(0)
@@ -1429,7 +1431,7 @@
 					if(!druggy)
 						see_invisible = SEE_INVISIBLE_LIVING
 
-			else if(!seer)
+			else if(!seer && !has_ninja_mask)
 				see_invisible = SEE_INVISIBLE_LIVING