Merge pull request #4082 from deathride58/donoritemmodularization

Donator item modularization + manual sync of sprites with upstream + manual mirrors + donor item fixes

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"
+	icon_state = "infcloak-i"
-	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_state = "infcollar"
+	icon = 'icons/obj/custom.dmi'
-	item_state = "infcollar"
+	icon_state = "infcollar-i"
+	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_state = "zombscarf"
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "zombscarf-i"
 	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_state = "labred"
+	icon = 'icons/obj/custom.dmi'
-	item_state = "labred"
+	icon_state = "labred-i"
+	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 = 'icons/obj/custom.dmi'
-	icon_override = 'icons/mob/citadel/suit.dmi'
+	icon_override = 'icons/obj/custom.dmi'
-	icon_state = "carrotcloak"
+	icon_state = "carrotcloak-i"
-	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
@@ -107,10 +114,10 @@
 /obj/item/clothing/neck/cloak/festive
 	name = "Celebratory Cloak of Morozko"
 	desc = " It probably will protect from snow, charcoal or elves."
-	icon = 'icons/obj/clothing/cloaks.dmi'
+	icon = 'icons/obj/custom.dmi'
-	icon_override = 'icons/mob/citadel/suit.dmi'
+	icon_state = "festive-i"
-	icon_state = "festivecloak"
+	item_state = "festive-w"
-	item_state = "festiveloak"
+	icon_override = 'icons/obj/custom.dmi'
 	w_class = WEIGHT_CLASS_SMALL
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
 
@@ -119,9 +126,10 @@
 
 /obj/item/clothing/mask/luchador/zigfie
 	name = "Alboroto Rosa mask"
-	icon = 'icons/mob/mask.dmi'
+	icon = 'icons/obj/custom.dmi'
-	icon_state = "lucharzigfie"
+	icon_state = "lucharzigfie-i"
-	item_state = "lucharzigfie"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "lucharzigfie-w"
 
 
 /*PLACEHOLDER*/
@@ -159,8 +167,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_state = "hos-g"
+	icon = 'icons/obj/custom.dmi'
-	item_state = "hos-g"
+	icon_state = "hos-g-i"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "hos-g-w"
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
 
 
@@ -170,14 +180,15 @@
 	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'
-	icon_state = "stalker"
+	item_state = "stalker-w"
+	icon_override = 'icons/obj/custom.dmi'
+	icon_state = "stalker-i"
 
 
 /*Sylas*/
@@ -185,8 +196,9 @@
 	name = "collar"
 	desc = "It's a collar..."
 	icon = 'icons/obj/custom.dmi'
-	icon_state = "petcollar-stripe"
+	icon_state = "petcollar-stripe-i"
-	item_color = "petcollar-stripe"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "petcollar-stripe-w"
 	tagname = null
 
 
@@ -194,17 +206,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"
+	icon = 'icons/obj/custom.dmi'
-	item_state = "ssing"
+	icon_state = "singer-i"
-	item_color = "ssing"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "singer-w"
+	item_color = "singer-i"
 	fitted = NO_FEMALE_UNIFORM
 	alternate_worn_layer = ABOVE_SHOES_LAYER
 	can_adjust = 0
 
 
 /obj/item/clothing/shoes/sneakers/pink
-	icon_state = "pink"
+	icon = 'icons/obj/custom.dmi'
-	item_state = "pink"
+	icon_state = "pink-i"
+	icon_override = 'icons/obj/custom.dmi'
+	item_state = "pink-w"
 
 
 /*Fractious*/
@@ -212,10 +228,8 @@
 /obj/item/clothing/suit/vermillion
 	name = "vermillion clothing"
 	desc = "Some clothing."
-	icon_state = "vermillion-w"
+	icon_state = "vermillion-i"
-	item_state = "vermillion-i"
+	item_state = "vermillion-w"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
 	icon = 'icons/obj/custom.dmi'
-
+	icon_override = 'icons/obj/custom.dmi'
-
-

code/game/gamemodes/wizard/spellbook.dm

@@ -897,6 +897,9 @@
 	to_chat(user,"<span class='warning'>[src] suddenly vanishes!</span>")
 	qdel(src)
 
+/obj/item/spellbook/oneuse/random
+	icon_state = "random_book"
+
 /obj/item/spellbook/oneuse/random/Initialize()
 	..()
 	var/static/banned_spells = list(/obj/item/spellbook/oneuse/mimery_blockade, /obj/item/spellbook/oneuse/mimery_guns)

code/game/machinery/vending.dm

@@ -678,6 +678,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 
 /obj/machinery/vending/snack/random
 	name = "\improper Random Snackies"
+	icon_state = "random_snack"
 	desc = "Uh oh!"
 
 /obj/machinery/vending/snack/random/Initialize()
@@ -730,6 +731,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 
 /obj/machinery/vending/cola/random
 	name = "\improper Random Drinkies"
+	icon_state = "random_cola"
 	desc = "Uh oh!"
 
 /obj/machinery/vending/cola/random/Initialize()

code/game/objects/items/cosmetics.dm

@@ -25,9 +25,11 @@
 
 /obj/item/lipstick/random
 	name = "lipstick"
+	icon_state = "random_lipstick"
 
 /obj/item/lipstick/random/New()
 	..()
+	icon_state = "lipstick"
 	colour = pick("red","purple","lime","black","green","blue","white")
 	name = "[colour] lipstick"
 

code/game/objects/items/devices/flashlight.dm

@@ -488,16 +488,14 @@
 
 /obj/item/device/flashlight/glowstick/random
 	name = "random colored glowstick"
+	icon_state = "random_glowstick"
+	color = null
 
 /obj/item/device/flashlight/glowstick/random/Initialize()
-	var/list/glowtypes = typesof(/obj/item/device/flashlight/glowstick)
-	glowtypes -= /obj/item/device/flashlight/glowstick/random
-
-	var/obj/item/device/flashlight/glowstick/glowtype = pick(glowtypes)
-
-	name = initial(glowtype.name)
-	color = initial(glowtype.color)
 	. = ..()
+	var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random)
+	new T(loc)
+	return INITIALIZE_HINT_QDEL
 
 /obj/item/device/flashlight/spotlight //invisible lighting source
 	name = "disco light"

code/game/objects/items/devices/taperecorder.dm

@@ -289,6 +289,9 @@
 				fix()
 
 //Random colour tapes
+/obj/item/device/tape/random
+	icon_state = "random_tape"
+
 /obj/item/device/tape/random/New()
 	icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
 	..()

code/game/objects/items/grenades/clusterbuster.dm

@@ -129,6 +129,9 @@
 
 
 //random clusterbuster spawner
+/obj/item/grenade/clusterbuster/random
+	icon_state = "random_clusterbang"
+
 /obj/item/grenade/clusterbuster/random/New()
 	var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster))
 	new real_type(loc)

code/game/objects/items/storage/wallets.dm

@@ -72,6 +72,9 @@
 	else
 		return ..()
 
+/obj/item/storage/wallet/random
+	icon_state = "random_wallet"
+
 /obj/item/storage/wallet/random/PopulateContents()
 	var/item1_type = pick( /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c50, /obj/item/stack/spacecash/c500)
 	var/item2_type
@@ -86,3 +89,4 @@
 			new item2_type(src)
 		if(item3_type)
 			new item3_type(src)
+	update_icon()

code/game/objects/structures/bedsheet_bin.dm

@@ -225,7 +225,7 @@ LINEN BINS
 
 
 /obj/item/bedsheet/random
-	icon_state = "sheetrainbow"
+	icon_state = "random_bedsheet"
 	item_color = "rainbow"
 	name = "random bedsheet"
 	desc = "If you're reading this description ingame, something has gone wrong! Honk!"

code/game/objects/structures/flora.dm

@@ -285,10 +285,13 @@
 	user.remove_alt_appearance("sneaking_mission")
 
 /obj/item/twohanded/required/kirbyplants/random
+	icon = 'icons/obj/flora/_flora.dmi'
+	icon_state = "random_plant"
 	var/list/static/states
 
 /obj/item/twohanded/required/kirbyplants/random/Initialize()
 	. = ..()
+	icon = 'icons/obj/flora/plants.dmi'
 	if(!states)
 		generate_states()
 	icon_state = pick(states)

code/modules/clothing/glasses/engine_goggles.dm

@@ -8,7 +8,8 @@
 /obj/item/clothing/glasses/meson/engine
 	name = "engineering scanner goggles"
 	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation."
-	icon_state = "trayson"
+	icon_state = "trayson-meson"
+	item_state = "trayson-meson"
 	actions_types = list(/datum/action/item_action/toggle_mode)
 	origin_tech = "materials=3;magnets=3;engineering=3;plasmatech=3"
 
@@ -117,14 +118,22 @@
 		flick_overlay(pic, list(user.client), 8)
 
 /obj/item/clothing/glasses/meson/engine/update_icon()
-	icon_state = "[initial(icon_state)]-[mode]"
+	icon_state = "trayson-[mode]"
-	if(istype(loc, /mob/living/carbon/human/))
+	update_mob()
-		var/mob/living/carbon/human/user = loc
+
-		if(user.glasses == src)
+/obj/item/clothing/glasses/meson/engine/proc/update_mob()
+	item_state = icon_state
+	if(isliving(loc))
+		var/mob/living/user = loc
+		if(user.get_item_by_slot(slot_glasses) == src)
 			user.update_inv_glasses()
+		else
+			user.update_inv_hands()
 
 /obj/item/clothing/glasses/meson/engine/tray //atmos techs have lived far too long without tray goggles while those damned engineers get their dual-purpose gogles all to themselves
 	name = "optical t-ray scanner"
+	icon_state = "trayson-t-ray"
+	item_state = "trayson-t-ray"
 	desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
 	origin_tech = "materials=3;magnets=2;engineering=2"
 

code/modules/clothing/gloves/color.dm

@@ -188,7 +188,7 @@
 /obj/item/clothing/gloves/color/random
 	name = "random gloves"
 	desc = "These gloves are supposed to be a random color..."
-	icon_state = "white"
+	icon_state = "random_gloves"
 	item_state = "wgloves"
 	item_color = "mime"
 

code/modules/hydroponics/beekeeping/beebox.dm

@@ -58,6 +58,7 @@
 /obj/structure/beebox/premade/New()
 	..()
 
+	icon_state = "beebox"
 	var/datum/reagent/R = null
 	if(random_reagent)
 		R = pick(subtypesof(/datum/reagent))
@@ -80,6 +81,7 @@
 
 
 /obj/structure/beebox/premade/random
+	icon_state = "random_beebox"
 	random_reagent = TRUE
 
 

code/modules/library/random_books.dm

@@ -1,3 +1,6 @@
+/obj/item/book/manual/random
+	icon_state = "random_book"
+
 /obj/item/book/manual/random/Initialize()
 	..()
 	var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki)
@@ -6,6 +9,7 @@
 	return INITIALIZE_HINT_QDEL
 
 /obj/item/book/random
+	icon_state = "random_book"
 	var/amount = 1
 	var/category = null
 
@@ -20,6 +24,7 @@
 /obj/structure/bookcase/random
 	var/category = null
 	var/book_count = 2
+	icon_state = "random_bookcase"
 	anchored = TRUE
 	state = 2
 

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -40,6 +40,9 @@
 		if(51 to INFINITY)
 			icon_state = "full"
 
+/obj/item/reagent_containers/blood/random
+	icon_state = "random_bloodpack"
+
 /obj/item/reagent_containers/blood/random/Initialize()
 	blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-", "L")
 	. = ..()