From 97338c726261d8460f05e97da44df4e3aa0ef223 Mon Sep 17 00:00:00 2001 From: "tronaldnwn@hotmail.com" Date: Fri, 25 Mar 2011 02:03:50 +0000 Subject: [PATCH] Night vision goggles. They have a range of five tiles. Enjoy. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1274 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing/glasses.dm | 6 ++++++ code/modules/mob/living/carbon/human/life.dm | 4 ++++ icons/mob/eyes.dmi | Bin 2860 -> 3758 bytes icons/obj/clothing/glasses.dmi | Bin 2721 -> 2968 bytes 4 files changed, 10 insertions(+) diff --git a/code/defines/obj/clothing/glasses.dm b/code/defines/obj/clothing/glasses.dm index a9713b7c2a4..0334db29995 100644 --- a/code/defines/obj/clothing/glasses.dm +++ b/code/defines/obj/clothing/glasses.dm @@ -17,6 +17,12 @@ item_state = "glasses" origin_tech = "magnets=2" +/obj/item/clothing/glasses/night + name = "Night Vision Goggles" + icon_state = "night" + item_state = "glasses" + origin_tech = "magnets=2" + /obj/item/clothing/glasses/regular name = "Prescription Glasses" icon_state = "glasses" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index b6d3e33a031..33b4a16799e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -691,6 +691,10 @@ src.see_in_dark = 3 if(!src.druggy) src.see_invisible = 0 + else if (istype(src.glasses, /obj/item/clothing/glasses/night)) + src.see_in_dark = 5 + if(!src.druggy) + src.see_invisible = 0 else if (istype(src.glasses, /obj/item/clothing/glasses/thermal)) src.sight |= SEE_MOBS src.see_in_dark = 4 diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index c537c4a4e7c501f5f4c079d39e791b7d492a0104..08523e0d7a9023a505382610782a2fada401e009 100644 GIT binary patch literal 3758 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