From 1b180a8fd3dd74157e10e2aabf539558df4a1fdd Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sun, 14 Jan 2018 19:26:54 -0500 Subject: [PATCH] POLARIS: The return of the material scanner overlay --- code/_onclick/hud/hud.dm | 3 +++ code/modules/clothing/glasses/glasses.dm | 3 +++ code/modules/mob/living/carbon/human/life.dm | 2 +- icons/obj/hud_full.dmi | Bin 5906 -> 7847 bytes 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 9ab596feaa..d9624d1d5d 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -13,6 +13,7 @@ var/list/global_huds = list( global_hud.thermal, global_hud.meson, global_hud.science, + global_hud.material, global_hud.holomap ) @@ -31,6 +32,7 @@ var/list/global_huds = list( var/obj/screen/thermal var/obj/screen/meson var/obj/screen/science + var/obj/screen/material var/obj/screen/holomap /datum/global_hud/proc/setup_overlay(var/icon_state) @@ -68,6 +70,7 @@ var/list/global_huds = list( thermal = setup_overlay("thermal_hud") meson = setup_overlay("meson_hud") science = setup_overlay("science_hud") + material = setup_overlay("material_hud") // The holomap screen object is actually totally invisible. // Station maps work by setting it as an images location before sending to client, not diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index c6528a109e..f7806ad245 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -191,6 +191,9 @@ BLIND // can't see anything vision_flags = SEE_OBJS enables_planes = list(VIS_FULLBRIGHT) +/obj/item/clothing/glasses/material/New() + ..() + overlay = global_hud.material /obj/item/clothing/glasses/material/prescription name = "prescription optical material scanner" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 56f07b2bc6..c1ac369064 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1094,7 +1094,7 @@ ..() - client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask, global_hud.nvg, global_hud.thermal, global_hud.meson, global_hud.science, global_hud.whitense) + client.screen.Remove(global_hud.blurry, global_hud.druggy, global_hud.vimpaired, global_hud.darkMask, global_hud.nvg, global_hud.thermal, global_hud.meson, global_hud.science, global_hud.material, global_hud.whitense) if(istype(client.eye,/obj/machinery/camera)) var/obj/machinery/camera/cam = client.eye diff --git a/icons/obj/hud_full.dmi b/icons/obj/hud_full.dmi index 04a2b548c63bb4718ce7fa5130faafa2b6b54b1d..ee980e9d7df61e09c24c617cff42185c2806d25c 100644 GIT binary patch literal 7847 zcmeAS@N?(olHy`uVBq!ia0y~yU|qn#zRt zkAb0LPVc#mT!#!KSRPpZ50-hWCu+4LWunN*3;UW{o^AhmaM^?bP0l+XkKlhcO& literal 5906 zcmeAS@N?(olHy`uVBq!ia0y~yU_JoC9Be?5U)Ka?1F4>>kcbkO)Z*l#%z~24{5%GR ziaEWfHgX*@5OI5G`CYT_R;*S@!AT{}NegRPInQq8oFP(l`PVPLuEizR?EA#7KTK1f zaq-eQ*GID!UYu_gwEjhQgIoPe57s{K7568<(sEvW@^=yc?0k=(5iC;aLH&<}>VG}Y zdNAqE=Lx<#*>)$F-K1q$B>FSZ*LytJ!HVZ z;wbH!*~gX1GleUNS^veMx;H+o-(&CE)IYXlXjr-th;U?JW?-10 z(7?#R;304TD5AoV03?N241gpjlLP}p0}CS$1A{{o127;IMwO3-%xEGQ%^ssA!Dtyd zS{;m5l%s8e(bm$CY#6pYE`2+Xfx&kE$9uMn3`I5vfO&be={wrWA58?KUA@tgV6?wK pS{;lI`i!;-Mo0ce#F*#@_6I+BFGW4n3;`B<44$rjF6*2UngDdy$fp1R