donator item modularization + manual sync of sprites upstream

code/citadel/custom_loadout/custom_items.dm

@@ -16,17 +16,20 @@
 /obj/item/clothing/neck/cloak/inferno
 	name = "Kiara's Cloak"
 	desc = "The design on this seems a little too familiar."
-	icon = 'icons/obj/clothing/cloaks.dmi'
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "infcloak"
-	item_state = "infcloak"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "infcloak-w"
 	w_class = WEIGHT_CLASS_SMALL
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 
 /obj/item/clothing/neck/petcollar/inferno
 	name = "Kiara's Collar"
 	desc = "A soft black collar that seems to stretch to fit whoever wears it."
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "infcollar"
-	item_state = "infcollar"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "infcollar-w"
 	item_color = null
 	tagname = null
 
@@ -43,7 +46,7 @@
 /obj/item/lighter/gold
 	name = "\improper Engraved Zippo"
 	desc = "A shiny and relatively expensive zippo lighter. There's a small etched in verse on the bottom that reads, 'No Gods, No Masters, Only Man.'"
-	icon = 'icons/obj/cigarettes.dmi'
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "gold_zippo"
 	item_state = "gold_zippo"
 	w_class = WEIGHT_CLASS_TINY
@@ -58,16 +61,20 @@
 
 /obj/item/clothing/neck/scarf/zomb //Default white color, same functionality as beanies.
 	name = "A special scarf"
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "zombscarf"
 	desc = "A fashionable collar"
-	item_color = "zombscarf"
+	icon_override = 'icons/obj/custom.dmi'
+	item_color = "zombscarf-w"
 	dog_fashion = /datum/dog_fashion/head
 
 /obj/item/clothing/suit/toggle/labcoat/mad/red
 	name = "\improper The Mad's labcoat"
 	desc = "An oddly special looking coat."
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "labred"
-	item_state = "labred"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "labred-w"
 
 
 /*PLACEHOLDER*/
@@ -86,17 +93,17 @@
 /obj/item/clothing/neck/cloak/carrot
 	name = "carrot cloak"
 	desc = "A cloak in the shape and color of a carrot!"
-	icon = 'icons/obj/clothing/cloaks.dmi'
-	icon_override = 'icons/mob/citadel/suit.dmi'
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/obj/custom.dmi'
 	icon_state = "carrotcloak"
-	item_state = "carrotcloak"
+	item_state = "carrotcloak-w"
 	w_class = WEIGHT_CLASS_SMALL
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 
 /obj/item/toy/plush/tree
 	name = "christmass tree plushie"
 	desc = "A festive plush that squeeks when you squeeze it!"
-	icon = 'icons/obj/plushes.dmi'
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "pine_c"
 	item_state = "pine_c"
 	w_class = WEIGHT_CLASS_SMALL
@@ -109,9 +116,10 @@
 
 /obj/item/clothing/mask/luchador/zigfie
 	name = "Alboroto Rosa mask"
-	icon = 'icons/mob/mask.dmi'
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "lucharzigfie"
-	item_state = "lucharzigfie"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "lucharzigfie-w"
 
 
 /*PLACEHOLDER*/
@@ -149,8 +157,10 @@
 /obj/item/clothing/suit/trenchcoat/green
 	name = "Reece's Great Coat"
 	desc = "You would swear this was in your nightmares after eating too many veggies."
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "hos-g"
-	item_state = "hos-g"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "hos-g-w"
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
 
 
@@ -160,13 +170,14 @@
 	desc = "Every good russian spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go."
 	icon = 'icons/obj/custom.dmi'
 	icon_state = "russianflask"
-	item_state = "russianflask"
 	volume = 60
 
 /obj/item/clothing/mask/gas/stalker
 	name = "S.T.A.L.K.E.R. mask"
 	desc = "Smells like reactor four."
-	item_state = "stalker"
+	icon = 'icons/obj/custom.dmi'
+	item_state = "stalker-w"
+	icon_override = 'icons/obj/custom.dmi'
 	icon_state = "stalker"
 
 
@@ -176,7 +187,8 @@
 	desc = "It's a collar..."
 	icon = 'icons/obj/custom.dmi'
 	icon_state = "petcollar-stripe"
-	item_color = "petcollar-stripe"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "petcollar-stripe-w"
 	tagname = null
 
 
@@ -184,17 +196,21 @@
 /obj/item/clothing/under/singery/custom
 	name = "bluish performer's outfit"
 	desc = "Just looking at this makes you want to sing."
-	icon_state = "ssing"
-	item_state = "ssing"
-	item_color = "ssing"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "singer"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "singer-w"
+	item_color = "singer"
 	fitted = NO_FEMALE_UNIFORM
 	alternate_worn_layer = ABOVE_SHOES_LAYER
 	can_adjust = 0
 
 
 /obj/item/clothing/shoes/sneakers/pink
+	icon = 'icons/obj/custom.dmi'
 	icon_state = "pink"
-	item_state = "pink"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "pink-w"