More Conflict Resolution

code/modules/customitems/item_defines.dm

@@ -133,6 +133,11 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "book_berner_1"
 
+/obj/item/clothing/glasses/sunglasses/fake/fluff/kaki //Rapidvalj: Kakicharakiti
+	name = "broken thermonocle"
+	desc = "A weathered Vox thermonocle, doesn't seem to work anymore."
+	icon_state = "thermoncle"
+
 /obj/item/weapon/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad
 	name = "purple engraved zippo"
 	desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
@@ -279,6 +284,12 @@
 //////////// Gloves ////////////
 
 //////////// Eye Wear ////////////
+/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro //T0EPIC4U: Ty Omaha
+	name = "Tacticool EyePro"
+	desc = "Tacticool ballistic glasses, for making all operators look badass."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "eyepro"
+	item_state = "eyepro"
 
 //////////// Hats ////////////
 /obj/item/clothing/head/fluff/heather_winceworth // Regens: Heather Winceworth
@@ -332,6 +343,11 @@
 	desc = "A beret, an artist's favorite headwear. This one has two holes cut on the edges."
 	icon_state = "linda_beret"
 
+/obj/item/clothing/head/fluff/kaki //Rapidvalj: Kakicharakiti
+	name = "sleek fancy leader hat"
+	desc = "A uniquely colored vox leader hat. Has some signs of wear."
+	icon_state = "kakicharakiti"
+
 //////////// Suits ////////////
 /obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Socialsystem: Lynn Fea
 	name = "Robotics labcoat"