merges https://github.com/tgstation/tgstation/pull/32678

2017-11-22 17:40:25 -05:00
parent b6630b41d1
commit 8d39fb9dce
1 changed files with 14 additions and 5 deletions
@@ -8,7 +8,8 @@
 /obj/item/clothing/glasses/meson/engine
 	name = "engineering scanner goggles"
 	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation."
-	icon_state = "trayson"
+	icon_state = "trayson-meson"
+	item_state = "trayson-meson"
 	actions_types = list(/datum/action/item_action/toggle_mode)
 	origin_tech = "materials=3;magnets=3;engineering=3;plasmatech=3"

@@ -117,14 +118,22 @@
 		flick_overlay(pic, list(user.client), 8)

 /obj/item/clothing/glasses/meson/engine/update_icon()
-	icon_state = "[initial(icon_state)]-[mode]"
-	if(istype(loc, /mob/living/carbon/human/))
-		var/mob/living/carbon/human/user = loc
-		if(user.glasses == src)
+	icon_state = "trayson-[mode]"
+	update_mob()
+
+/obj/item/clothing/glasses/meson/engine/proc/update_mob()
+	item_state = icon_state
+	if(isliving(loc))
+		var/mob/living/user = loc
+		if(user.get_item_by_slot(slot_glasses) == src)
 			user.update_inv_glasses()
+		else
+			user.update_inv_hands()

 /obj/item/clothing/glasses/meson/engine/tray //atmos techs have lived far too long without tray goggles while those damned engineers get their dual-purpose gogles all to themselves
 	name = "optical t-ray scanner"
+	icon_state = "trayson-t-ray"
+	item_state = "trayson-t-ray"
 	desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
 	origin_tech = "materials=3;magnets=2;engineering=2"