Fixes a couple of tiny glasses bugs

This commit is contained in:
Anewbe
2019-01-15 15:00:31 -05:00
committed by VirgoBot
parent a0cb0a347d
commit 916e32e9eb
2 changed files with 48 additions and 1 deletions
@@ -124,4 +124,24 @@
/datum/gear/eyes/circuitry
display_name = "goggles, circuitry (empty)"
path = /obj/item/clothing/glasses/circuitry
<<<<<<< HEAD
path = /obj/item/clothing/glasses/circuitry
=======
path = /obj/item/clothing/glasses/circuitry
/datum/gear/eyes/glasses/rimless
display_name = "Glasses, rimless"
path = /obj/item/clothing/glasses/rimless
/datum/gear/eyes/glasses/prescriptionrimless
display_name = "Glasses, prescription rimless"
path = /obj/item/clothing/glasses/regular/rimless
/datum/gear/eyes/glasses/thin
display_name = "Glasses, thin frame"
path = /obj/item/clothing/glasses/thin
/datum/gear/eyes/glasses/prescriptionthin
display_name = "Glasses, prescription thin frame"
path = /obj/item/clothing/glasses/regular/thin
>>>>>>> e0d442b... Merge pull request #5838 from Cerebulon/glassesfix