Merge remote-tracking branch 'upstream/master' into hudpatches

2020-03-17 16:29:13 -05:00
parent 1b72357925 fcf51a285d
commit 6b392e09c2
58 changed files with 476 additions and 562 deletions
@@ -102,7 +102,8 @@
 /obj/item/clothing/glasses/hud/diagnostic/sunglasses
 	name = "diagnostic HUDSunglasses"
 	desc = "Sunglasses with a diagnostic HUD."
-	icon_state = "sunhuddiagnostic"
+	icon_state = "sunhuddiag"
+	item_state = "glasses"
 	darkness_view = 1
 	flash_protect = 1
 	tint = 1