Merge pull request #6144 from Citadel-Station-13/upstream-merge-36609

[MIRROR] Night vision goggles no longer cancel out thermal eyes
2018-03-31 06:15:19 -05:00
parent acc54fedb0 a220d45ae6
commit 437301bf21
2 changed files with 0 additions and 2 deletions
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -109,7 +109,6 @@
 	icon_state = "night"
 	item_state = "glasses"
 	darkness_view = 8
-	vision_flags = SEE_BLACKNESS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green

--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -46,7 +46,6 @@
 	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()