From b49665f533ce68de049176b0c73b0495b9bad368 Mon Sep 17 00:00:00 2001
From: KasparoVy <unknown-soldier@hotmail.ca>
Date: Sat, 24 Dec 2016 02:25:55 -0500
Subject: [PATCH] Returns Colour Vision when you Unequip Noir Glasses

Fixes a bug where taking off noir glasses while noir mode was on didn't
give you your colour vision back.
---
 code/modules/clothing/glasses/glasses.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index f8ff3ea4ecc..565e8fc317b 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -257,6 +257,9 @@
 		if(noir_mode)
 			if(color_view && user.client && !user.client.color)
 				animate(user.client, color = color_view, time = 10)
+	else
+		if(user.client && user.client.color)
+			animate(usr.client, color = null, time = 10)
 	..(user, slot)
 
 /obj/item/clothing/glasses/sunglasses/noir/dropped(mob/living/carbon/human/user)