Attempt to Fix Merge Conflicts

With Fork this time

code/modules/customitems/item_defines.dm

@@ -1992,6 +1992,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	override_robotize_painted = FALSE
 	robotize_children = FALSE
 
+
 /obj/item/clothing/suit/storage/toggle/fluff/tokash_mantle //Consular Mantle - Suvek Tokash - Evandorf
 	name = "consular's mantle"
 	desc = "A long, ornate, and somewhat extravagant cloak-like mantle. Fashioned with Hegemony colors, it serves as a symbol of the wearer's station and allegiance. Scenes of Unathi history and legend etched into the golden crest surmount the trailing, blood-red fabric. "