Upstream merge of material scanner overlay

This commit is contained in:
Arokha Sieyes
2018-01-14 19:26:54 -05:00
committed by Leshana
parent 6fb1b66ced
commit 9c86e3b5d7
4 changed files with 8 additions and 2 deletions

View File

@@ -12,7 +12,8 @@ var/list/global_huds = list(
global_hud.nvg, global_hud.nvg,
global_hud.thermal, global_hud.thermal,
global_hud.meson, global_hud.meson,
global_hud.science global_hud.science,
global_hud.material
) )
/datum/hud/var/obj/screen/grab_intent /datum/hud/var/obj/screen/grab_intent
@@ -30,6 +31,7 @@ var/list/global_huds = list(
var/obj/screen/thermal var/obj/screen/thermal
var/obj/screen/meson var/obj/screen/meson
var/obj/screen/science var/obj/screen/science
var/obj/screen/material
/datum/global_hud/proc/setup_overlay(var/icon_state) /datum/global_hud/proc/setup_overlay(var/icon_state)
var/obj/screen/screen = new /obj/screen() var/obj/screen/screen = new /obj/screen()
@@ -66,6 +68,7 @@ var/list/global_huds = list(
thermal = setup_overlay("thermal_hud") thermal = setup_overlay("thermal_hud")
meson = setup_overlay("meson_hud") meson = setup_overlay("meson_hud")
science = setup_overlay("science_hud") science = setup_overlay("science_hud")
material = setup_overlay("material_hud")
var/obj/screen/O var/obj/screen/O
var/i var/i

View File

@@ -191,6 +191,9 @@ BLIND // can't see anything
vision_flags = SEE_OBJS vision_flags = SEE_OBJS
enables_planes = list(VIS_FULLBRIGHT) enables_planes = list(VIS_FULLBRIGHT)
/obj/item/clothing/glasses/material/New()
..()
overlay = global_hud.material
/obj/item/clothing/glasses/material/prescription /obj/item/clothing/glasses/material/prescription
name = "prescription optical material scanner" name = "prescription optical material scanner"

View File

@@ -1091,7 +1091,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)) if(istype(client.eye,/obj/machinery/camera))
var/obj/machinery/camera/cam = client.eye var/obj/machinery/camera/cam = client.eye

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB