diff --git a/aurora.dme b/aurora.dme
index 731fd4a8..8313903b 100644
--- a/aurora.dme
+++ b/aurora.dme
@@ -38,6 +38,7 @@
 #define FILE_DIR "icons/obj/clothing/species/skrell"
 #define FILE_DIR "icons/obj/clothing/species/tajaran"
 #define FILE_DIR "icons/obj/clothing/species/unathi"
+#define FILE_DIR "icons/obj/custom_items"
 #define FILE_DIR "icons/obj/doors"
 #define FILE_DIR "icons/obj/flora"
 #define FILE_DIR "icons/obj/machines"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 28e9c06d..8cb625f1 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -1,9 +1,10 @@
 /obj/item/weapon/storage/belt/fluff/jace_toolbelt //Jace's Toolbelt - Jace Evans - Wittme91
 	name = "Jace's Toolbelt"
 	desc = "A large, well-worn toolbelt."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/jace_belt.dmi'
+	contained_sprite = 1
 	icon_state = "jace_belt"
-	item_state = "jace_belt"
+
 	can_hold = list(
 		"/obj/item/weapon/crowbar",
 		"/obj/item/weapon/screwdriver",
@@ -32,16 +33,15 @@
 /obj/item/clothing/tie/fluff/teranium_necklace //Teranium Necklace - Inis Tool-Truesight - Gollee
 	name = "Teranium Necklace"
 	desc = "A small electric blue crystal held on a fine metal chain."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/teranium_necklace.dmi'
 	icon_state = "teranium_necklace"
-	item_state = "teranium_necklace"
 	item_color = "teranium_necklace"
 	slot_flags = SLOT_MASK
 
 /obj/item/weapon/lighter/zippo/fluff/nikolai_zippo //Silver Plated Lighter - Nikolai Petirosky - Nikolai the beast
 	name = "Silver Plated Lighter"
 	desc = "A silver lighter, adorned with many wear marks."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/nikolai_zippo.dmi'
 	icon_state = "nikolai_zippo"
 	icon_on = "nikolai_zippoon"
 	icon_off = "nikolai_zippo"
@@ -49,7 +49,7 @@
 /obj/item/weapon/storage/box/fluff/nikolai_tin //Silver Cigar Tin - Nikolai Petirosky - Nikolai the beast
 	name = "Silver Cigar Tin"
 	desc = "A silver plated tin, a pleasant smell of tobacco eminating from it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/nikolai_tin.dmi'
 	icon_state = "nikolai_tin"
 	storage_slots = 5
 	max_w_class = 1
@@ -72,9 +72,9 @@
 /obj/item/clothing/suit/storage/fluff/edward_coat //Edward's Trenchcoat - Edward Smith - leore
 	name = "Edward's Trenchcoat"
 	desc = "A dusty old trenchcoat. It bears the faint initials E.S. on the collar."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/edward_coat.dmi'
 	icon_state = "edward_coat"
-	item_state = "edward_coat"
+	contained_sprite = 1
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder)
@@ -82,7 +82,7 @@
 /* /obj/item/weapon/storage/wallet/fluff/faith_wallet //Worn Wallet - Faith Skirata - FaithSkirata
  *	name = "Worn Wallet"
  *	desc = "A synthetic leather wallet, marked with burns and tears throughout. It smells funny."
- *	icon = 'icons/obj/custom_items.dmi'
+ *	icon = 'icons/obj/custom_items/
  *	icon_state = "faith_wallet"
  */
 
@@ -93,63 +93,61 @@
 /obj/item/clothing/shoes/sandal/fluff/raieed_sandals //Treasured Sandals - Raieed Amari - nikolaithebeast - DONE
 	name = "treasured sandals"
 	desc = "A pair of black sandals, which seem to hold the entire world on themselves."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/raieed_sandals.dmi'
 	icon_state = "raieed_sandals"
-	item_state = "raieed_sandals"
+	contained_sprite = 1
 
 /obj/item/clothing/suit/storage/fluff/raieed_labcoat //Treasured Labcoat - Raieed Amari - nikolaithebeast - DONE
 	name = "torn labcoat"
 	desc = "A old labcoat, torn beyond reorganization, but yet it still seems to be kept for."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/raieed_labcoat.dmi'
 	icon_state = "raieed_labcoat"
-	item_state = "raieed_labcoat"
+	contained_sprite = 1
 
 /obj/item/weapon/folder/fluff/may_notebook //May Izumi's Notebook - May Izumi - lk600 - DONE
 	name = "May Izumi's Notebook"
 	desc = "A pink notebook that is covered in hearts and little manga stickers. It is filled with lots of questions, replies and conversations from her past. It has 'May Izumi' printed on the front."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/izumi_notebook.dmi'
 	icon_state = "izumi_notebook"
 
 /obj/item/clothing/under/dress/fluff/olivia_uniform //Waitress Uniform - Olivia Conrad - meowykins - DONE
 	name = "Waitress Uniform"
 	desc = "A modest uniform. the name-tag reads 'Olivia Conrad'."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/olivia_skirt.dmi'
 	icon_state = "olivia_skirt"
-	item_color = "olivia_skirt"
-	item_state = "olivia_skirt"
+	contained_sprite = 1
 
 /obj/item/clothing/head/hairflower/fluff/olivia_flower //White Flower - Olivia Conrad - meowykins - DONE
 	name = "White flower"
 	desc = "A white flower. It has a clip on the back."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/olivia_flower.dmi'
 	icon_state = "olivia_flower"
-	item_state = "olivia_flower"
+	contained_sprite = 1
 
 /obj/item/clothing/under/rank/fluff/steven_unfirom //Naval Working Uniform - Steven Machnaughton - sgtsammac - INVESTIGATE
 	name = "Naval Working Uniform"
 	desc = "A working unfirom of the NanoTrasen Navy."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/steven_uniform.dmi'
 	icon_state = "steven_uniform"
-	item_color = "steven_uniform"
-	item_state = "steven_uniform"
+	contained_sprite = 1
 
 /obj/item/weapon/coin/fluff/sphere_coin //Rusty Coin - Yusani Thomas - f_sphere - DONE
 	name = "Rusty Coin"
 	desc = "A small, dirty coin. It looks like it has been around for ages."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/coin_sphere.dmi'
 	icon_state = "coin_sphere"
 
 /obj/item/weapon/weldingtool/fluff/dae_welder //Custom built welding tool - Atalanta Cascadia - daetactica - DONE
 	name = "welding tool"
 	desc = "A makeshift welding tool, seemingly made from old engine parts. It has a small sentence in what looks to be greek etched into its surface."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/welder.dmi'
 	icon_state = "welder"
 	item_state = null
 
 /obj/item/weapon/reagent_containers/glass/rag/fluff/rusty_handkerchief //handkerchief - Janet Fisher - rustysh4ckleford - DONE
 	name = "handkerchief"
 	desc = "An ordinary handkerchief. It looks well used."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/janet_handkerchief.dmi'
 	icon_state = "janet_handkerchief"
 
 	attack_self(mob/user as mob)
@@ -167,16 +165,16 @@
 /obj/item/weapon/disk/fluff/nebula_chip //data chip - Roxy Wallace - nebulaflare - DONE
 	name = "data chip"
 	desc = "A small green chip."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/nebula_chip.dmi'
 	icon_state = "nebula_chip"
 	w_class = 1
 
 /obj/item/clothing/glasses/fluff/nebula_glasses	//chich eyewear - Roxy Wallace - nebulaflare - DONE
 	name = "chic eyewear"
 	desc = "A stylish pair of glasses. They look custom made."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/nebula_glasses.dmi'
 	icon_state = "nebula_glasses"
-	item_state = "nebula_glasses"
+	contained_sprite = 1
 
 	var/chip
 
@@ -207,7 +205,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/tool_flask //Worn flask - Michael Tool - mrimatool - DONE
 	name = "worn flask"
 	desc = "A metal flask wrapped in a leather fashion."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/tool_flask.dmi'
 	icon_state = "tool_flask"
 	volume = 60
 
@@ -215,9 +213,9 @@
 /obj/item/clothing/head/soft/fluff/nebula_cap //Black baseball cap - Roxy Wallace - nebulaflare - DONE
 	name = "black baseball cap"
 	desc = "A black baseball cap."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/nebula_cap.dmi'
 	icon_state = "nebula_cap"
-	item_color = "nebula_cap"
+	contained_sprite = 1
 
 /obj/item/clothing/head/beret/centcom/officer/fluff/mirkoloio_beret //Navy beret - Fabian Goellstein - mirkoloio - DONE
 	name = "navy beret"
@@ -226,7 +224,7 @@
 /obj/item/device/pda/fluff/meowykins_pda //Data-Tablet - Miyako Yukimura - meowykins - DONE
 	name = "Data-tablet"
 	desc = "A black data-tablet"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/meowykins_pda.dmi'
 	icon_state = "meowykins_pda"
 	slot_flags = SLOT_ID | SLOT_BELT
 
@@ -245,16 +243,16 @@
 /obj/item/clothing/gloves/swat/fluff/hawk_gloves //Sharpshooter gloves - Hawk Silverstone - nebulaflare - DONE
 	desc = "These tactical gloves are tailor made for a marksman."
 	name = "\improper Sharpshooter Gloves"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/hawk_gloves.dmi'
 	icon_state = "hawk_gloves"
 	item_state = "swat_gl"
 
 /obj/item/clothing/suit/storage/fluff/fabian_coat //NT Navy coat - Fabian Goellstein - mirkoloio - DONE
 	name = "NT Navy coat"
 	desc = "A working coat of the NanoTrasen Navy. The nameplate carries the letters 'GOELLSTEIN'."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/fabian_coat.dmi'
 	icon_state = "fabian_coat_open"
-	item_state = "fabian_coat_open"
+	contained_sprite = 1
 
 	verb/toggle()
 		set name = "Toggle coat zipper"
@@ -279,7 +277,7 @@
 /obj/item/weapon/pen/fluff/eliza_pen //Fountain pen - Eliza Pond - forgottentraveller - DONE
 	desc = "A pen with an outer cylinder of black obsidian with gold metal clip. Monogrammed with silver inlay 'V.M.'"
 	name = "elegant pen"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/eliza_pen.dmi'
 	icon_state = "eliza_pen"
 	item_state = "pen"
 	var/ink = 1
@@ -302,7 +300,7 @@
 /obj/item/device/fluff/amy_player //Music player - Amy Heris - gollee - DONE - Modding
 	name = "music player"
 	desc = "An olive green HF24 in pristine condition, there is a small engraving on the back, reading 'To Amy, I will always be here for you, Varan.'"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/amy_player.dmi'
 	icon_state = "amy_player_off"
 	item_state = "electornic"
 	slot_flags = SLOT_BELT | SLOT_ID // | SLOT_EARS  wut
@@ -405,7 +403,7 @@
 /obj/item/device/fluff/sten_synth //VoiceOS.V2 - Sten Asval - vtol - DONE
 	name = "VoiceOS.V2"
 	desc = "A text-to-speech device with an appearance that is not too futuristic. It looks slim and light. On the back of it there are initials in silver: SA."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/synth.dmi'
 	icon_state = "synth"
 	item_state = "radio"
 	w_class = 2.0
@@ -481,7 +479,7 @@
 /obj/item/fluff/brenna_rock //Memento rock - Brenna Noton - mikalhvi - DONE
 	name = "memento rock"
 	desc = "A rounded-off chunk of a NanoTransen claimed asteroid." //I'm sorry. Too much description, nixed all of it.
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/rock.dmi'
 	icon_state = "rock"
 	item_state = ""
 	w_class = 2.0
@@ -503,7 +501,7 @@
 /obj/item/fluff/iris_bracelets //Silver bracelets - Iris Kilur - gollee - DONE
 	name = "silver bracelets"
 	desc = "Two silver bracelets, the scrolled one oversetting the other."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/iris_bracelets.dmi'
 	icon_state = "iris_bracelets"
 	item_state = ""
 	w_class = 1.0
@@ -512,7 +510,7 @@
 /obj/item/fluff/delivander_ring //Old wedding ring - Delivander Starbreeze - gollee - DONE
 	name = "old wedding ring"
 	desc = "A tarnished gold ring, there is writing inside it, “To Liura, forever.”"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/delivander_ring.dmi'
 	icon_state = "delivander_ring"
 	item_state = ""
 	w_class = 1.0
@@ -521,24 +519,23 @@
 /obj/item/clothing/head/welding/fluff/buck_mask //Blue Panther's welding mask - Buck Bradely - bluesp34r - DONE
 	name = "Blue Panther's welding mask"
 	desc = "A welding mask. This one in particular has a hand-painted, blue jungle cat face on it. It looks absolutely ferocious!"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/bluepanther.dmi'
 	icon_state = "bluepanther"
-	item_state = "bluepanther"
+	contained_sprite = 1
 
 /obj/item/clothing/gloves/fluff/amy_gloves //Red fingerless gloves - Amy Tilley - lk600 - DONE
 	name = "Red fingerless gloves"
 	desc = "A pair of red and black fingerless gloves that stretch up the arm. They look to be made of a soft wool and are well worn."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/amy_gloves.dmi'
 	icon_state = "amy_gloves"
-	item_state = "amy_gloves"
+	contained_sprite = 1
 	clipped = 1
 
 /obj/item/clothing/tie/fluff/cecillia_locket //Old locket - Cecillia Lambert - casperf1 - DONE
 	name = "old locket"
 	desc = "A dark metal locket, it seems at least sixty years old. The photo that was once inside is gone."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/cecillia_locket.dmi'
 	icon_state = "cecillia_locket1" //Keep as one, to indicate glass.
-	item_state = "cecillia_locket1"
 	item_color = "cecillia_locket1"
 	slot_flags = SLOT_MASK
 
@@ -580,27 +577,31 @@
 		..()
 		reagents.add_reagent("space_drugs", 5)
 		reagents.add_reagent("paroxetine", 5)
+/*
+
+THIS SHIT IS MISSING ANY AND ALL SPRITE FILES
 
 /obj/item/weapon/storage/backpack/satchel/fluff/cecillia_satchel //Satchel-bag - Cecillia Lambert - casperf1 - SPRITE
 	name = "satchel-bag"
 	desc = "This looks old, is not yours and if you're wearing it, the original owner is probably dead."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/cecillia_satchel.dmi'
 	icon_state = "cecillia_satchel"
-	item_state = "cecillia_satchel"
+	contained_sprite = 1
+*/
 
 /obj/item/clothing/glasses/regular/fluff/cecillia_glasses //Red prescription glasses - Cecillia Lamber - casperf1 - DONE
 	name = "red prescription glasses"
 	desc = "These glasses have been prescribed for a terrible pair of eyes."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/cecillia_glasses.dmi'
 	icon_state = "cecillia_glasses"
-	item_state = "cecillia_glasses"
+	contained_sprite = 1
 
 /obj/item/clothing/suit/wintercoat/fluff/temple_coat //Red coat - Temple Zorion - deatacita - DONE
 	name = "red coat"
 	desc = "An old red and black winter-coat, there looks to be spots of dried blood on it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/temple_coat.dmi'
 	icon_state = "temple_coat"
-	item_state = "temple_coat"
+	contained_sprite = 1
 
 /obj/item/clothing/shoes/jackboots/fluff/peter_boots //Worn boots - Peter Thrushwood - farcry11 - DONE
 	name = "worn boots"
@@ -609,9 +610,9 @@
 /obj/item/clothing/gloves/brown/fluff/peter_gloves //Cropped driving hloves - Peter Thrushwood - farcry11 - DONE
 	name = "cropped driving gloves"
 	desc = "A pair of high quality, fingerless driving gloves made of faux leather and faux velvet-leathern without and velvet within."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/peter_gloves.dmi'
 	icon_state = "peter_gloves"
-	item_state = "peter_gloves"
+	contained_sprite = 1
 	clipped = 1
 
 /obj/item/clothing/under/fluff/peter_shirt //Plaid shirt - Peter Thrushwood - farcry11 - SPRITE
@@ -624,16 +625,16 @@
 /obj/item/clothing/head/det_hat/fluff/leo_hat //Tagged brown hat - Leo Wyatt - keinto - DONE
 	name = "tagged brown hat"
 	desc = "A worn mid 20th century brown hat. If you look closely at the back, you can see a an embedded tag from the 'Museum of Terran Culture and Technology'."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/leo_hat.dmi'
 	icon_state = "leo_hat"
-	item_state = "leo_hat"
+	contained_sprite = 1
 
 /obj/item/clothing/suit/storage/det_suit/fluff/leo_coat //Tagged brown coat - Leo Wyatt - keinto - DONE
 	name = "tagged brown coat"
 	desc = "A worn mid 20th century brown trenchcoat. If you look closely at bottom of the back, you can see an embedded tag from the 'Museum of Terran Culture and Technology'."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/leo_coat.dmi'
 	icon_state = "leo_coat"
-	item_state = "leo_coat"
+	contained_sprite = 1
 
 /obj/item/weapon/gun/projectile/detective/semiauto/fluff/leo_gun //Instant Prosecutor - Leo Wyatt - keinto - DONE (stab)
 	name = "\improper Instant Prosecutor"
@@ -642,13 +643,13 @@
 /obj/item/weapon/bikehorn/rubberducky/fluff/bryce_ducky //Sir Duckens - Bryce Hunt - mrmajestic - DONE
 	name = "Sir Duckens"
 	desc = "A important and manly looking duck. He adorns a official looking cap and sunglasses. The hair on the back of your neck tingles as you look at it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/bryce_duck.dmi'
 	icon_state = "bryce_duck"
 
 /obj/item/weapon/reagent_containers/food/drinks/fluff/bryce_mug //duck mug - Bryce Hunt - mrmajestic - DONE
 	name = "\improper duck mug"
 	desc = "A fashionable and reasonably large mug filled with a delicious smelling coffee drink. The mug adorns what looks to be a rubber duck."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/bryce_mug.dmi'
 	icon_state = "bryce_mug"
 	volume = 30
 
@@ -661,16 +662,16 @@
 /obj/item/weapon/storage/belt/utility/fluff/fortune_belt //Fortune's toolbelt - Fortune Bloise - swat43 - DONE
 	name = "Fortune's toolbelt"
 	desc = "'Nothing can beat the mechanic when you have this badboy with you,' small text on the belts side is written."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/fortune_belt.dmi'
 	icon_state = "fortune_belt"
-	item_state = "fortune_belt"
+	contained_sprite = 1
 
 /obj/item/weapon/storage/backpack/satchel/fluff/fortune_bag //Fortune's bag - Fortune Bloise - swat43 - DONE
 	name = "Fortune's bag"
 	desc = "'For the wolf to survive, he needs to chop off his own leg' - Fortunes friends. A nice black satchel with a mech and a heart painting on it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/fortune_bag.dmi'
 	icon_state = "fortune_bag"
-	item_state = "fortune_bag"
+	contained_sprite = 1
 
 /obj/item/clothing/head/soft/fluff/mike_hat //BRI Hat - Mike Axel - Smifboy78 - DONE
 	name = "BRI Hat"
@@ -681,13 +682,13 @@
 /obj/item/toy/teddy/fluff/jenifer_bear //Doctor SnuggleBuns - Jenifer Clewett - bluesp34r - SPRITE
 	name = "Doctor SnuggleBuns"
 	desc = "A fluffy-wuffy brown teddy bear! This one is wearing a blue lab coat, much like a Chief Medical Officer!"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/jenifer_bear.dmi'
 	icon_state = "jenifer_bear"
 
 /obj/item/toy/fluff/jenifer_bear_head
 	name = "\improper teddybear head"
 	desc = "The head of a brown teddy, cruelly torn from its original body. You can see stuffing fall out of it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/jenifer_bear_head.dmi'
 	icon_state = "jenifer_bear_head"
 	w_class = 1
 	force = 1
@@ -696,9 +697,9 @@
 /obj/item/clothing/mask/muzzle/fluff/summer_jaws // Metal Jaw - Summer Floyd - Hivefleetchicken - DONE
 	name = "metal jaw"
 	desc = "A heavy-looking hunk of steel fused with the mouth and vocal chords of anyone unfortunate enough to have to wear it. It looks like a rather poor replacement for a mouth."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/summer_jaws.dmi'
 	icon_state = "summer_jaws"
-	item_state = "summer_jaws"
+	contained_sprite = 1
 	w_class = 2.0
 	flags = FPRINT | TABLEPASS | CONDUCT
 	slot_flags = SLOT_MASK
@@ -736,10 +737,11 @@
 /obj/item/clothing/tie/medal/fluff/vivian_heart // Platinum Heart - Vivian - XanderDox - DONE
 	name = "platinum heart"
 	desc = "The medal is white-plated platinum, and bears a red-cross on the front, the back is engraved, Vivian Rival, Medical Doctor & Species Rights Activist."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/vivian_heart.dmi'
 	icon_state = "vivian_heart"
 	item_color = "vivian_heart"
 
+
 /obj/item/clothing/head/ushanka/fluff/ava_ushanka	// Worn Ushanka - Ava Kalashnikova - demonofthefall - DONE
 	name = "worn ushanka"
 	desc = "An old ushanka, it looks well worn."
@@ -759,7 +761,7 @@
 /obj/item/clothing/tie/holobadge/fluff/hamil_badge // Internal Investigations Badge - Muhammad Hamil - Jackboot - DONE
 	name = "Internal Investigations Badge"
 	desc = "An Internal Investigation badge. Used by a special branch of the Elyran police force."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/hamil_badge.dmi'
 	icon_state = "hamil_badge"
 
 	attack_self(mob/user as mob)
@@ -769,16 +771,16 @@
 /obj/item/clothing/mask/gas/fluff/stefan_mask // Modified Gas Mask - Oliver Stefan - Nbielinski - DONE
 	desc = "This odd looking gas mask is quite clearly not of NanoTrasen origin as it sports a black metal polish, as well as a reflective face plate that mirrors the view of the mask itself. This particular mask appears to breathe with the user, hissing when they exhale, and whining softly as they inhale."
 	name = "Modified Gas Mask"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/stefan_mask.dmi'
 	icon_state = "stefan_mask"
-	item_state = "stefan_mask"
+	contained_sprite = 1
 
 /obj/item/weapon/melee/fluff/balisong // Orihara's Balisong - Shizuo Orihara - GlamourChariot - DONE
 	name = "Orihara's Balisong"
 	desc = "A small, black butterfly knife with comfortable handles and a mean looking blade. Perfect for dangerous towns where being stylish is just as important as being deadly."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/balisong.dmi'
 	icon_state = "balisong_0"
-	item_state = "balisong_m"
+	contained_sprite = 1
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
 	w_class = 1
@@ -792,7 +794,6 @@
 			"\red You with a bit a flair, open the balisong. The metallic shine of the blade touching your gaze.",\
 			"You hear an ominous click.")
 			icon_state = "balisong_1"
-			item_state = "balisong_m"
 			w_class = 3
 			force = 2
 			attack_verb = list("prodded")
@@ -826,21 +827,21 @@
 /obj/structure/stool/bed/chair/wheelchair/fluff/kit // Kit's Wheelchair - Cassidy Kit - Meowykins - DONE
 	name = "Kit's Wheelchair"
 	desc = "A wheelchair, that has large flames on the back of the seat. It has a nametag on one of the arms, reading 'Kit.'"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/kit_wheels.dmi'
 	icon_state = "kit_wheels"
 	anchored = 0
 	movable = 1
 
 	handle_rotation()
 		overlays = null
-		var/image/O = image(icon = 'icons/obj/custom_items.dmi', icon_state = "kit_w_overlay", layer = FLY_LAYER, dir = src.dir)
+		var/image/O = image(icon = 'icons/obj/custom_items/kit_wheels.dmi', icon_state = "kit_w_overlay", layer = FLY_LAYER, dir = src.dir)
 		overlays += O
 		if(buckled_mob)
 			buckled_mob.dir = dir
 
 /obj/item/weapon/storage/fluff/binder // Black Binder - Cassidy Kit - Meowykins - DONE
 	name = "Black Binder"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/kit_binder.dmi'
 	icon_state = "kit_binder"
 	w_class = 2
 	can_hold = list(
@@ -860,7 +861,7 @@
 /obj/item/weapon/pen/fluff/kit_pen // Fountain Pen - Cassidy Kit - Meowykins - DONE
 	desc = "A small fountain pen. It has several spots to change the cartridge inside for another color, as well as a selector switch for ease of use."
 	name = "fountain pen"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/kit_pen.dmi'
 	icon_state = "kit_pen"
 	item_state = "pen"
 	var/ink = 1
@@ -889,16 +890,17 @@
 /obj/item/clothing/suit/storage/fluff/dalton_coat //Black Overcoat - Robert Dalton - Valkrae
 	name = "black overcoat"
 	desc = " A black overcoat. It seems worn, and well-made. The coat smells of tobacco and smoke."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/dalton_coat.dmi'
 	icon_state = "dalton_coat"
-	item_state = "dalton_coat"
+	contained_sprite = 1
 
 
 /obj/item/clothing/suit/storage/rohitin_jacket //CSI Jacket - Ana Ro'hi'tin - SueTheCake
 	name = "CSI jacket"
 	desc = " A black jacket with the words 'CSI' printed in the back in bright, white letters."
+	icon = 'icons/obj/custom_items/rohitinjacket.dmi'
 	icon_state = "rohitinjacket"
-	item_state = "rohitinjacket"
+	contained_sprite = 1
 	blood_overlay_type = "armor"
 	allowed = list(/obj/item/stack/medical, /obj/item/weapon/reagent_containers/dropper, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/syringe, \
 	/obj/item/device/healthanalyzer, /obj/item/device/flashlight, /obj/item/device/radio, /obj/item/weapon/tank/emergency_oxygen)
@@ -915,6 +917,7 @@
 /obj/item/fluff/paragon_datachip //Data Chip - PARAGON - MasterZipZero
 	name = "data chip"
 	desc = "A small bluespace data chip, marked with a tiny heart."
+	icon = 'icons/obj/custom_items/paragon_datachip.dmi'
 	icon_state = "paragon_datachip"
 	item_state = "dermal"
 	slot_flags = SLOT_HEAD
@@ -923,7 +926,7 @@
 /obj/item/clothing/tie/fluff/karima_datadrive //Data Drive Pendant -  Karima Mo'Taki - NebulaFlare
 	name = "Data drive"
 	desc = "A small necklace, the pendant flips open to reveal a data drive."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/motaki_datadrive.dmi'
 	icon_state = "motaki_datadrive"
 	item_state = "holobadge-cord"
 	item_color = "holobadge-cord"
@@ -933,28 +936,28 @@
 /obj/item/clothing/tie/fluff/dove_necklace //Diamond Necklace -  Charlie Dove - Thundy
 	name = "Diamond necklace"
 	desc = "Small, gold chain with a diamond pendant. Looks expensive."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/dove_necklace.dmi'
 	icon_state = "dove_necklace"
-	item_state = "dove_necklace"
+	contained_sprite = 1
 	item_color = "dove_necklace"
 	slot_flags = SLOT_MASK
 
 /obj/item/weapon/nullrod/fluff/hartam_rod // Faol's resolve - Hartam Bartam
 	name = "Faol's resolve"
 	desc = "A symbol forged of steel, tempered in holy water, it has several gold-colored rings on it. Judging by the numerous dents and scratches on this thing, it has seen a lot of years..."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/hartam_rod.dmi'
 	icon_state = "hartam_rod"
 
 /obj/item/device/radio/headset/fluff/sam_implant // Cochlear Implant - Samantha Mason - Bakagaijin
 	name = "Cochlear Implant"
 	desc = "A specialized earpiece and headset combination. It appears to help those who are deaf hear."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/sam_implant.dmi'
 	icon_state = "sam_implant"
 
 /obj/item/weapon/melee/fluff/tina_knife // Consecrated Athame - Tina Kaekel - Tainevva
 	name = "Consecrated Athame"
 	desc = "An athame used in occult rituals. The double-edged dagger is dull. The handle is black with a pink/white occult design strewn about it, and 'Tina' is inscribed into it in decorated letters."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/tina_knife.dmi'
 	icon_state = "tina_knife"
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
@@ -964,30 +967,31 @@
 /obj/item/clothing/tie/holobadge/fluff/peter_badge // Peter Stone's badge - Peter Stone - Jakers457
 	name = "Peter Stone's badge"
 	desc = "An old looking badge that has seen as many ordeals as its owner. It has the name 'Peter Stone' inscribed on it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/peter_badge.dmi'
 	icon_state = "peter_badge"
 	stored_name = "Peter Stone"
 
 /obj/item/clothing/tie/armband/iac_armband // Interstellar Aid Corps armband - Grey Ryan - Jackboot
 	name = "Interstellar Aid Corps armband"
 	desc = "An armband denoting its wearer as a medical worker of the Interstellar Aid Corps."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/iac_armband.dmi'
 	icon_state = "iac_armband"
-	item_color = "iac"
+	item_color = "iac_armband"
+	contained_sprite = 1
 
 /obj/item/clothing/gloves/fluff/imraj_kara // kara - Imraj Brar - Canon35
 	name = "kara"
 	desc = "A bracelet made of what looks like steel."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/imraj_kara.dmi'
 	icon_state = "imraj_kara"
-	item_color = "imraj_kara"
+	contained_sprite = 1
 
 /obj/item/weapon/melee/fluff/imraj_kirpan // kirban - Imraj Brar - Canon35
 	name = "kirpan"
 	desc = "A knife with a metal grip and blade, has strange characters written on the sides."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/imraj_kirpan.dmi'
 	icon_state = "imraj_kirpan"
-	item_state = "imraj_kirpan"
+	contained_sprite = 1
 	w_class = 2.0
 	throwforce = 0
 	throw_speed = 4
@@ -996,16 +1000,16 @@
 /obj/item/clothing/head/fluff/imraj_turban // turban - Imraj Brar - Canon35
 	name = "turban"
 	desc = "A piece of soft headgear."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/imraj_turban.dmi'
 	icon_state = "imraj_turban"
-	item_state = "imraj_turban"
+	contained_sprite = 1
 	armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/weapon/fluff/imraj_kangha // kangha - Imraj Brar - Canon35
 	name = "kangha"
 	desc = "A small wooden comb."
 	w_class = 1.0
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/imraj_kangha.dmi'
 	icon_state = "imraj_kangha"
 
 	attack_self(mob/user)
@@ -1022,31 +1026,34 @@
 /obj/item/clothing/suit/fluff/apophis_coat // Thick Jacket - Apophis Quihtzin - Kingmatt9
 	name = "thick jacket"
 	desc = "A brown leather trenchcoat-like jacket, it smells of snow."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/apophis_jacket.dmi'
 	icon_state = "apophis_jacket"
-	item_state = "apophis_jacket"
+	contained_sprite = 1
 
 /obj/item/clothing/suit/armor/vest/fluff/sam_armour // Stabproof Vest - Sam Macnaughton - Sgtsammac
 	name = "stab proof vest"
 	desc = "It's a red vest, with high visibility strips. You can see the emblem of the NanoTrasen security division on the right breast."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/sam_armour.dmi'
 	icon_state = "sam_armour"
-	item_state = "sam_armour"
+	contained_sprite = 1
+
+/*
+THIS SHIT IS MISSING ITS SPRITES TOO
 
-//////////////////////////////////////////
-////////////REDO THIS/////////////
-//////////////////////////////////////////
 /obj/item/device/radio/fluff/smile_bara // Dr. Smile - Daniela Baranova - Rechkalov
 	name = "Dr. Smile"
 	desc = "A black suitcase with a simple yet soothing/supportive smiley-face on them."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/smilemotherfucker.dmi'
 	icon_state = "smilemotherfucker"
-	item_state = "smilemotherfucker_m"
+//	item_state = "smilemotherfucker_m"
+	contained_sprite = 1
+
+*/
 
 /obj/item/weapon/coin/fluff/luna_coin //Purple Coin - Luna Tsuki - Wer6
 	name = "purple coin"
 	desc = "An anodized purple titanium coin in a sealed transparent case. The stamped portrait of a woman adorns one side, with the name 'Luna Tsuki' beneath. A hawk symbol rests on the opposing side, with the words 'We will miss you!' stamped beneath."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/luna_coin.dmi'
 	icon_state = "luna_coin"
 
 	attack_self(mob/user as mob)
@@ -1059,9 +1066,9 @@
 /obj/item/clothing/suit/storage/fluff/varick_coat //Frontier Duffle Coat - Talia Varick - OneOneThreeEight
 	name = "Frontier duffle coat"
 	desc = "A lightweight, navy duffle coat. This frontier coat is fashioned with horn-toggles, a golden leopard pin, cuff tassles and even intentional decorative tears in the fabric itself."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/varick_coat.dmi'
 	icon_state = "varick_coat_open"
-	item_state = "varick_coat_open"
+	contained_sprite = 1
 
 	verb/toggle()
 		set name = "Toggle horn toggles"
@@ -1084,26 +1091,27 @@
 /obj/item/clothing/under/rank/fluff/faust_uniform //Eridani Federal Army uniform - Bryce Faust - Hackie Mhan
 	name = "Eridani Federal Army uniform"
 	desc = "This uniform is old, with multiple stitches. Certain parts of the uniform are missing and yet it is still of a distinctly high quality"
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/faust_uniform.dmi'
 	icon_state = "faust_uniform"
-	item_color = "faust_uniform"
-	item_state = "faust_uniform"
+	contained_sprite = 1
 
 /obj/item/clothing/head/beret/fluff/faust_beret //military beret - Bryce Faust - Hackie Mhan
 	name = "military beret"
 	desc = "This beret has the Eridani Federal Army symbol, it's old but still in good shape."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/faust_beret.dmi'
 	icon_state = "faust_beret"
-	item_state = "faust_beret"
+	contained_sprite = 1
 
 /obj/item/clothing/head/ushanka/fluff/kuznetsov_ushanka	// Ushanka - Dominika Kuznetsov - Kerbal22
 	name = "ushanka"
 	desc = "A comfortable fur ushanka with a small red star embroidered on the front."
+/*
+BEGIN R I P HAZERI
 
 /obj/item/clothing/mask/cigarette/pipe/fluff/hazeri_pipe //Hazeri's Pipe - Hazeri Saakhat - BlueSp34r
 	name = "Hazeri's Pipe"
 	desc = "A worn smoking pipe. It is made out of rare wood only found in Moghes, with little leaves sticking out of it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/
 	icon_state = "hazeri_pipe_off"
 	item_state = "hazeri_pipe_off"
 	icon_on = "hazeri_pipe_on"
@@ -1114,16 +1122,21 @@
 /obj/item/weapon/cane/fluff/hazeri_cane //Hazeri's Cane - Hazeri Saakhat - BlueSp34r
 	name = "Hazeri's Cane"
 	desc = "An old warped cane with a flat bottom. It appears leafy; crafted from Moghian wood."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/
 	icon_state = "hazeri_cane"
 	item_state = "hazeri_cane"
 
+END R I P HAZERI
+*/
+
 /obj/item/clothing/tie/fluff/kane_badge // Detective's Badge - Kane DeWitt - Joe Kane
 	name = "Detective's Badge"
 	desc = "A shiny brass detective's badge, backed by brown leather. Inscribed on the front is 'Kane DeWitt, DeWitt Detective Agency'."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/kane_badge.dmi'
 	icon_state = "kane_badge"
 	item_color = "kane_badge"
+	contained_sprite = 1
+
 
 	slot_flags = SLOT_BELT
 
@@ -1138,9 +1151,9 @@
 /obj/item/clothing/gloves/fluff/odanu_gloves //Old Unathi Handwraps - Odanu Adanutha - Prospekt1559
 	name = "old Unathi handwraps"
 	desc = "Old, stained hand wraps made of cloth. Holds in a miniscule amount of warmth and offers slight protection to one's knuckles."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/odanu_gloves.dmi'
 	icon_state = "odanu_gloves"
-	item_state = "odanu_gloves"
+	contained_sprite = 1
 	species_restricted = list("Unathi")
 	clipped = 1
 	cold_protection = HANDS
@@ -1149,7 +1162,7 @@
 /obj/item/fluff/red_gemstone //Red Gemstone - Mister Dosh - Somekindofpony
 	name = "red gemstone"
 	desc = "A small red piece of glass, cut into the shape of a gemstone."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/red_gemstone.dmi'
 	icon_state = "red_gemstone"
 	item_state = ""
 	w_class = 2.0
@@ -1167,7 +1180,7 @@
 /obj/item/clothing/tie/fluff/epsilon_badge // EPSILON PI Badge - EPSiLON - Prospekt1559
 	name = "EPSiLON private investigator badge"
 	desc = "A leather badge with gold plating on the front. When looked at closely it can be seen to be engraved with an eyeglass, with the letters 'E' and 'I' underneath."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/epsilon_badge.dmi'
 	icon_state = "epsilon_badge"
 	item_color = "kane_badge"
 
@@ -1199,7 +1212,7 @@
 /obj/item/clothing/tie/fluff/scofield_watch //Hunter Scofield - Smifboy78
 	name = "gold pocket-watch"
 	desc = "A small pocket watch. It appears to be gold plated, with the initials D.M.S on the back."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/scofield_watch.dmi'
 	icon_state = "scofield_watch"
 	w_class = 1
 	var wired = 1
@@ -1217,18 +1230,17 @@
 /obj/item/clothing/head/fluff/ziva_bandana //Ziva's Bandana - Ziva Mo'taki - SierraKomodo
 	name = "old bandana"
 	desc = "An old orange-ish-yellow bandana. It has a few stains from engine grease, and the color has been dulled."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/motaki_bandana.dmi'
 	icon_state = "motaki_bandana"
-	item_state = "motaki_bandana"
+	contained_sprite = 1
 	flags = FPRINT|TABLEPASS
 	flags_inv = 0
 
 /obj/item/clothing/tie/fluff/straughan_necklace //Rejection Syndrome Necklace - Nick Straughan - Nanotoxin
 	name = "rejection syndrome necklace"
 	desc = "A small silver necklace with the words, 'prosthetic rejection syndrome; body rejects mechanical eyes, shaded eyewear needed.' engraved into it."
-	icon = 'icons/obj/custom_items.dmi'
+	icon = 'icons/obj/custom_items/straughan_necklace.dmi'
 	icon_state = "straughan_necklace"
-	item_state = "straughan_necklace"
 	item_color = "straughan_necklace"
 	slot_flags = SLOT_MASK
 
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 52db8a3d..4452078a 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index e784cc74..a7ad1d4d 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/belt_mirror.dmi
index c5babb1e..9358ba3c 100644
Binary files a/icons/mob/belt_mirror.dmi and b/icons/mob/belt_mirror.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 90c524a6..f8e6093f 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index fb6ed933..b5895a8a 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi
index 635146b9..64f01805 100644
Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index ee3e5290..659ea415 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 66ea91d0..9b3211d5 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 77ee1897..dd33e7d6 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 37c84f14..6b819038 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 105e29c0..bde3d1c2 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 206b00ec..b2b12d16 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 88f394d1..2e4a0c3a 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/custom_items/amy_gloves.dmi b/icons/obj/custom_items/amy_gloves.dmi
new file mode 100644
index 00000000..fe493df8
Binary files /dev/null and b/icons/obj/custom_items/amy_gloves.dmi differ
diff --git a/icons/obj/custom_items/amy_player.dmi b/icons/obj/custom_items/amy_player.dmi
new file mode 100644
index 00000000..a518f667
Binary files /dev/null and b/icons/obj/custom_items/amy_player.dmi differ
diff --git a/icons/obj/custom_items/apophis_jacket.dmi b/icons/obj/custom_items/apophis_jacket.dmi
new file mode 100644
index 00000000..4e9f13b2
Binary files /dev/null and b/icons/obj/custom_items/apophis_jacket.dmi differ
diff --git a/icons/obj/custom_items/balisong.dmi b/icons/obj/custom_items/balisong.dmi
new file mode 100644
index 00000000..9117c921
Binary files /dev/null and b/icons/obj/custom_items/balisong.dmi differ
diff --git a/icons/obj/custom_items/bluepanther.dmi b/icons/obj/custom_items/bluepanther.dmi
new file mode 100644
index 00000000..8fca946b
Binary files /dev/null and b/icons/obj/custom_items/bluepanther.dmi differ
diff --git a/icons/obj/custom_items/bryce_duck.dmi b/icons/obj/custom_items/bryce_duck.dmi
new file mode 100644
index 00000000..501e1f19
Binary files /dev/null and b/icons/obj/custom_items/bryce_duck.dmi differ
diff --git a/icons/obj/custom_items/bryce_mug.dmi b/icons/obj/custom_items/bryce_mug.dmi
new file mode 100644
index 00000000..d388de1a
Binary files /dev/null and b/icons/obj/custom_items/bryce_mug.dmi differ
diff --git a/icons/obj/custom_items/cecillia_glasses.dmi b/icons/obj/custom_items/cecillia_glasses.dmi
new file mode 100644
index 00000000..4fb18d34
Binary files /dev/null and b/icons/obj/custom_items/cecillia_glasses.dmi differ
diff --git a/icons/obj/custom_items/cecillia_locket.dmi b/icons/obj/custom_items/cecillia_locket.dmi
new file mode 100644
index 00000000..b6fcee7f
Binary files /dev/null and b/icons/obj/custom_items/cecillia_locket.dmi differ
diff --git a/icons/obj/custom_items/cecillia_satchel.dmi b/icons/obj/custom_items/cecillia_satchel.dmi
new file mode 100644
index 00000000..e69de29b
diff --git a/icons/obj/custom_items/coin_sphere.dmi b/icons/obj/custom_items/coin_sphere.dmi
new file mode 100644
index 00000000..adde8213
Binary files /dev/null and b/icons/obj/custom_items/coin_sphere.dmi differ
diff --git a/icons/obj/custom_items/dalton_coat.dmi b/icons/obj/custom_items/dalton_coat.dmi
new file mode 100644
index 00000000..47062822
Binary files /dev/null and b/icons/obj/custom_items/dalton_coat.dmi differ
diff --git a/icons/obj/custom_items/delivander_ring.dmi b/icons/obj/custom_items/delivander_ring.dmi
new file mode 100644
index 00000000..97b04e1a
Binary files /dev/null and b/icons/obj/custom_items/delivander_ring.dmi differ
diff --git a/icons/obj/custom_items/dove_necklace.dmi b/icons/obj/custom_items/dove_necklace.dmi
new file mode 100644
index 00000000..ac42d2c3
Binary files /dev/null and b/icons/obj/custom_items/dove_necklace.dmi differ
diff --git a/icons/obj/custom_items/edward_coat.dmi b/icons/obj/custom_items/edward_coat.dmi
new file mode 100644
index 00000000..5e52f12c
Binary files /dev/null and b/icons/obj/custom_items/edward_coat.dmi differ
diff --git a/icons/obj/custom_items/eliza_pen.dmi b/icons/obj/custom_items/eliza_pen.dmi
new file mode 100644
index 00000000..18b9dbf1
Binary files /dev/null and b/icons/obj/custom_items/eliza_pen.dmi differ
diff --git a/icons/obj/custom_items/epsilon_badge.dmi b/icons/obj/custom_items/epsilon_badge.dmi
new file mode 100644
index 00000000..9de5a9f8
Binary files /dev/null and b/icons/obj/custom_items/epsilon_badge.dmi differ
diff --git a/icons/obj/custom_items/fabian_coat.dmi b/icons/obj/custom_items/fabian_coat.dmi
new file mode 100644
index 00000000..975ddb43
Binary files /dev/null and b/icons/obj/custom_items/fabian_coat.dmi differ
diff --git a/icons/obj/custom_items/faust_beret.dmi b/icons/obj/custom_items/faust_beret.dmi
new file mode 100644
index 00000000..dabff035
Binary files /dev/null and b/icons/obj/custom_items/faust_beret.dmi differ
diff --git a/icons/obj/custom_items/faust_uniform.dmi b/icons/obj/custom_items/faust_uniform.dmi
new file mode 100644
index 00000000..a2e59154
Binary files /dev/null and b/icons/obj/custom_items/faust_uniform.dmi differ
diff --git a/icons/obj/custom_items/fortune_bag.dmi b/icons/obj/custom_items/fortune_bag.dmi
new file mode 100644
index 00000000..20bd447e
Binary files /dev/null and b/icons/obj/custom_items/fortune_bag.dmi differ
diff --git a/icons/obj/custom_items/fortune_belt.dmi b/icons/obj/custom_items/fortune_belt.dmi
new file mode 100644
index 00000000..f40c2db3
Binary files /dev/null and b/icons/obj/custom_items/fortune_belt.dmi differ
diff --git a/icons/obj/custom_items/hamil_badge.dmi b/icons/obj/custom_items/hamil_badge.dmi
new file mode 100644
index 00000000..c23296d5
Binary files /dev/null and b/icons/obj/custom_items/hamil_badge.dmi differ
diff --git a/icons/obj/custom_items/hartam_rod.dmi b/icons/obj/custom_items/hartam_rod.dmi
new file mode 100644
index 00000000..585a4d3d
Binary files /dev/null and b/icons/obj/custom_items/hartam_rod.dmi differ
diff --git a/icons/obj/custom_items/hawk_gloves.dmi b/icons/obj/custom_items/hawk_gloves.dmi
new file mode 100644
index 00000000..9c992938
Binary files /dev/null and b/icons/obj/custom_items/hawk_gloves.dmi differ
diff --git a/icons/obj/custom_items/iac_armband.dmi b/icons/obj/custom_items/iac_armband.dmi
new file mode 100644
index 00000000..df57044d
Binary files /dev/null and b/icons/obj/custom_items/iac_armband.dmi differ
diff --git a/icons/obj/custom_items/imraj_kangha.dmi b/icons/obj/custom_items/imraj_kangha.dmi
new file mode 100644
index 00000000..d821719a
Binary files /dev/null and b/icons/obj/custom_items/imraj_kangha.dmi differ
diff --git a/icons/obj/custom_items/imraj_kara.dmi b/icons/obj/custom_items/imraj_kara.dmi
new file mode 100644
index 00000000..dfd8d100
Binary files /dev/null and b/icons/obj/custom_items/imraj_kara.dmi differ
diff --git a/icons/obj/custom_items/imraj_kirpan.dmi b/icons/obj/custom_items/imraj_kirpan.dmi
new file mode 100644
index 00000000..9164c41d
Binary files /dev/null and b/icons/obj/custom_items/imraj_kirpan.dmi differ
diff --git a/icons/obj/custom_items/imraj_turban.dmi b/icons/obj/custom_items/imraj_turban.dmi
new file mode 100644
index 00000000..276202c8
Binary files /dev/null and b/icons/obj/custom_items/imraj_turban.dmi differ
diff --git a/icons/obj/custom_items/iris_bracelets.dmi b/icons/obj/custom_items/iris_bracelets.dmi
new file mode 100644
index 00000000..87b76845
Binary files /dev/null and b/icons/obj/custom_items/iris_bracelets.dmi differ
diff --git a/icons/obj/custom_items/izumi_notebook.dmi b/icons/obj/custom_items/izumi_notebook.dmi
new file mode 100644
index 00000000..8a55dc83
Binary files /dev/null and b/icons/obj/custom_items/izumi_notebook.dmi differ
diff --git a/icons/obj/custom_items/jace_belt.dmi b/icons/obj/custom_items/jace_belt.dmi
new file mode 100644
index 00000000..fc739296
Binary files /dev/null and b/icons/obj/custom_items/jace_belt.dmi differ
diff --git a/icons/obj/custom_items/janet_handkerchief.dmi b/icons/obj/custom_items/janet_handkerchief.dmi
new file mode 100644
index 00000000..b8ea8463
Binary files /dev/null and b/icons/obj/custom_items/janet_handkerchief.dmi differ
diff --git a/icons/obj/custom_items/jenifer_bear.dmi b/icons/obj/custom_items/jenifer_bear.dmi
new file mode 100644
index 00000000..4e0cbe30
Binary files /dev/null and b/icons/obj/custom_items/jenifer_bear.dmi differ
diff --git a/icons/obj/custom_items/jenifer_bear_head.dmi b/icons/obj/custom_items/jenifer_bear_head.dmi
new file mode 100644
index 00000000..2d8adeab
Binary files /dev/null and b/icons/obj/custom_items/jenifer_bear_head.dmi differ
diff --git a/icons/obj/custom_items/kane_badge.dmi b/icons/obj/custom_items/kane_badge.dmi
new file mode 100644
index 00000000..3b1cac48
Binary files /dev/null and b/icons/obj/custom_items/kane_badge.dmi differ
diff --git a/icons/obj/custom_items/kit_binder.dmi b/icons/obj/custom_items/kit_binder.dmi
new file mode 100644
index 00000000..88ffb106
Binary files /dev/null and b/icons/obj/custom_items/kit_binder.dmi differ
diff --git a/icons/obj/custom_items/kit_pen.dmi b/icons/obj/custom_items/kit_pen.dmi
new file mode 100644
index 00000000..96941e04
Binary files /dev/null and b/icons/obj/custom_items/kit_pen.dmi differ
diff --git a/icons/obj/custom_items/kit_wheels.dmi b/icons/obj/custom_items/kit_wheels.dmi
new file mode 100644
index 00000000..00942522
Binary files /dev/null and b/icons/obj/custom_items/kit_wheels.dmi differ
diff --git a/icons/obj/custom_items/leo_coat.dmi b/icons/obj/custom_items/leo_coat.dmi
new file mode 100644
index 00000000..366f2ba3
Binary files /dev/null and b/icons/obj/custom_items/leo_coat.dmi differ
diff --git a/icons/obj/custom_items/leo_hat.dmi b/icons/obj/custom_items/leo_hat.dmi
new file mode 100644
index 00000000..a1cc7029
Binary files /dev/null and b/icons/obj/custom_items/leo_hat.dmi differ
diff --git a/icons/obj/custom_items/luna_coin.dmi b/icons/obj/custom_items/luna_coin.dmi
new file mode 100644
index 00000000..f73480ab
Binary files /dev/null and b/icons/obj/custom_items/luna_coin.dmi differ
diff --git a/icons/obj/custom_items/meowykins_pda.dmi b/icons/obj/custom_items/meowykins_pda.dmi
new file mode 100644
index 00000000..e23daa26
Binary files /dev/null and b/icons/obj/custom_items/meowykins_pda.dmi differ
diff --git a/icons/obj/custom_items/motaki_bandana.dmi b/icons/obj/custom_items/motaki_bandana.dmi
new file mode 100644
index 00000000..7ab64be9
Binary files /dev/null and b/icons/obj/custom_items/motaki_bandana.dmi differ
diff --git a/icons/obj/custom_items/motaki_datadrive.dmi b/icons/obj/custom_items/motaki_datadrive.dmi
new file mode 100644
index 00000000..2396b1b5
Binary files /dev/null and b/icons/obj/custom_items/motaki_datadrive.dmi differ
diff --git a/icons/obj/custom_items/nebula_cap.dmi b/icons/obj/custom_items/nebula_cap.dmi
new file mode 100644
index 00000000..7171bdf8
Binary files /dev/null and b/icons/obj/custom_items/nebula_cap.dmi differ
diff --git a/icons/obj/custom_items/nebula_chip.dmi b/icons/obj/custom_items/nebula_chip.dmi
new file mode 100644
index 00000000..1cc415ff
Binary files /dev/null and b/icons/obj/custom_items/nebula_chip.dmi differ
diff --git a/icons/obj/custom_items/nebula_glasses.dmi b/icons/obj/custom_items/nebula_glasses.dmi
new file mode 100644
index 00000000..3eb143c2
Binary files /dev/null and b/icons/obj/custom_items/nebula_glasses.dmi differ
diff --git a/icons/obj/custom_items/nikolai_tin.dmi b/icons/obj/custom_items/nikolai_tin.dmi
new file mode 100644
index 00000000..dd061572
Binary files /dev/null and b/icons/obj/custom_items/nikolai_tin.dmi differ
diff --git a/icons/obj/custom_items/nikolai_zippo.dmi b/icons/obj/custom_items/nikolai_zippo.dmi
new file mode 100644
index 00000000..7ee51872
Binary files /dev/null and b/icons/obj/custom_items/nikolai_zippo.dmi differ
diff --git a/icons/obj/custom_items/odanu_gloves.dmi b/icons/obj/custom_items/odanu_gloves.dmi
new file mode 100644
index 00000000..c697f030
Binary files /dev/null and b/icons/obj/custom_items/odanu_gloves.dmi differ
diff --git a/icons/obj/custom_items/olivia_flower.dmi b/icons/obj/custom_items/olivia_flower.dmi
new file mode 100644
index 00000000..c1c3dd5f
Binary files /dev/null and b/icons/obj/custom_items/olivia_flower.dmi differ
diff --git a/icons/obj/custom_items/olivia_skirt.dmi b/icons/obj/custom_items/olivia_skirt.dmi
new file mode 100644
index 00000000..f460e734
Binary files /dev/null and b/icons/obj/custom_items/olivia_skirt.dmi differ
diff --git a/icons/obj/custom_items/paragon_datachip.dmi b/icons/obj/custom_items/paragon_datachip.dmi
new file mode 100644
index 00000000..7b1c4be2
Binary files /dev/null and b/icons/obj/custom_items/paragon_datachip.dmi differ
diff --git a/icons/obj/custom_items/peter_badge.dmi b/icons/obj/custom_items/peter_badge.dmi
new file mode 100644
index 00000000..67b32ca7
Binary files /dev/null and b/icons/obj/custom_items/peter_badge.dmi differ
diff --git a/icons/obj/custom_items/peter_gloves.dmi b/icons/obj/custom_items/peter_gloves.dmi
new file mode 100644
index 00000000..3b9385c7
Binary files /dev/null and b/icons/obj/custom_items/peter_gloves.dmi differ
diff --git a/icons/obj/custom_items/raieed_labcoat.dmi b/icons/obj/custom_items/raieed_labcoat.dmi
new file mode 100644
index 00000000..c1b8cd88
Binary files /dev/null and b/icons/obj/custom_items/raieed_labcoat.dmi differ
diff --git a/icons/obj/custom_items/raieed_sandals.dmi b/icons/obj/custom_items/raieed_sandals.dmi
new file mode 100644
index 00000000..59666851
Binary files /dev/null and b/icons/obj/custom_items/raieed_sandals.dmi differ
diff --git a/icons/obj/custom_items/red_gemstone.dmi b/icons/obj/custom_items/red_gemstone.dmi
new file mode 100644
index 00000000..9acb27f1
Binary files /dev/null and b/icons/obj/custom_items/red_gemstone.dmi differ
diff --git a/icons/obj/custom_items/rock.dmi b/icons/obj/custom_items/rock.dmi
new file mode 100644
index 00000000..5625e990
Binary files /dev/null and b/icons/obj/custom_items/rock.dmi differ
diff --git a/icons/obj/custom_items/rohitinjacket.dmi b/icons/obj/custom_items/rohitinjacket.dmi
new file mode 100644
index 00000000..f7da2982
Binary files /dev/null and b/icons/obj/custom_items/rohitinjacket.dmi differ
diff --git a/icons/obj/custom_items/sam_armour.dmi b/icons/obj/custom_items/sam_armour.dmi
new file mode 100644
index 00000000..13490a37
Binary files /dev/null and b/icons/obj/custom_items/sam_armour.dmi differ
diff --git a/icons/obj/custom_items/sam_implant.dmi b/icons/obj/custom_items/sam_implant.dmi
new file mode 100644
index 00000000..bb2a76a4
Binary files /dev/null and b/icons/obj/custom_items/sam_implant.dmi differ
diff --git a/icons/obj/custom_items/scofield_watch.dmi b/icons/obj/custom_items/scofield_watch.dmi
new file mode 100644
index 00000000..796adc19
Binary files /dev/null and b/icons/obj/custom_items/scofield_watch.dmi differ
diff --git a/icons/obj/custom_items/shaw_degree.dmi b/icons/obj/custom_items/shaw_degree.dmi
new file mode 100644
index 00000000..235be3d2
Binary files /dev/null and b/icons/obj/custom_items/shaw_degree.dmi differ
diff --git a/icons/obj/custom_items/smilemotherfucker.dmi b/icons/obj/custom_items/smilemotherfucker.dmi
new file mode 100644
index 00000000..e69de29b
diff --git a/icons/obj/custom_items/stefan_mask.dmi b/icons/obj/custom_items/stefan_mask.dmi
new file mode 100644
index 00000000..90c9de67
Binary files /dev/null and b/icons/obj/custom_items/stefan_mask.dmi differ
diff --git a/icons/obj/custom_items/steven_uniform.dmi b/icons/obj/custom_items/steven_uniform.dmi
new file mode 100644
index 00000000..b107d8ac
Binary files /dev/null and b/icons/obj/custom_items/steven_uniform.dmi differ
diff --git a/icons/obj/custom_items/straughan_necklace.dmi b/icons/obj/custom_items/straughan_necklace.dmi
new file mode 100644
index 00000000..ef5d3bf9
Binary files /dev/null and b/icons/obj/custom_items/straughan_necklace.dmi differ
diff --git a/icons/obj/custom_items/summer_jaws.dmi b/icons/obj/custom_items/summer_jaws.dmi
new file mode 100644
index 00000000..55776115
Binary files /dev/null and b/icons/obj/custom_items/summer_jaws.dmi differ
diff --git a/icons/obj/custom_items/synth.dmi b/icons/obj/custom_items/synth.dmi
new file mode 100644
index 00000000..cd078e61
Binary files /dev/null and b/icons/obj/custom_items/synth.dmi differ
diff --git a/icons/obj/custom_items/temple_coat.dmi b/icons/obj/custom_items/temple_coat.dmi
new file mode 100644
index 00000000..3b478d25
Binary files /dev/null and b/icons/obj/custom_items/temple_coat.dmi differ
diff --git a/icons/obj/custom_items/teranium_necklace.dmi b/icons/obj/custom_items/teranium_necklace.dmi
new file mode 100644
index 00000000..c2882bb5
Binary files /dev/null and b/icons/obj/custom_items/teranium_necklace.dmi differ
diff --git a/icons/obj/custom_items/tina_knife.dmi b/icons/obj/custom_items/tina_knife.dmi
new file mode 100644
index 00000000..1ef3ed0e
Binary files /dev/null and b/icons/obj/custom_items/tina_knife.dmi differ
diff --git a/icons/obj/custom_items/tool_flask.dmi b/icons/obj/custom_items/tool_flask.dmi
new file mode 100644
index 00000000..1251e9c1
Binary files /dev/null and b/icons/obj/custom_items/tool_flask.dmi differ
diff --git a/icons/obj/custom_items/varick_coat.dmi b/icons/obj/custom_items/varick_coat.dmi
new file mode 100644
index 00000000..e6c41951
Binary files /dev/null and b/icons/obj/custom_items/varick_coat.dmi differ
diff --git a/icons/obj/custom_items/vivian_heart.dmi b/icons/obj/custom_items/vivian_heart.dmi
new file mode 100644
index 00000000..3b15ce9c
Binary files /dev/null and b/icons/obj/custom_items/vivian_heart.dmi differ
diff --git a/icons/obj/custom_items/welder.dmi b/icons/obj/custom_items/welder.dmi
new file mode 100644
index 00000000..6504fd3e
Binary files /dev/null and b/icons/obj/custom_items/welder.dmi differ