Adds and reorganises a bunch of custom items.

code/defines/obj/weapon.dm

@@ -1015,10 +1015,6 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove
 	icon_state = "pen_red"
 	text_color = "#FF0000"
 
-/obj/item/weapon/pen/multi
-	desc = "It's a cool looking pen. Lots of colors!"
-	name = "multicolor pen"
-
 /obj/item/weapon/pen/feather
 	name = "feathery pen"
 	desc = "A gold pen disguised as a quill. How quaint."

code/game/objects/items/clothing.dm

@@ -383,13 +383,18 @@ THERMAL GLASSES
 	else if(src.icon_state == "labcoat_pink")
 		src.icon_state = "labcoat_pink_open"
 		usr << "You unbutton the labcoat."
-	else if(src.icon_state == "labcoat_sleeve_open")
+	else if(src.icon_state == "labcoat_red_open")
-		src.icon_state = "labcoat_sleeve"
+		src.icon_state = "labcoat_red"
 		usr << "You button up the labcoat."
-	else if(src.icon_state == "labcoat_sleeve")
+	else if(src.icon_state == "labcoat_red")
-		src.icon_state = "labcoat_sleeve_open"
+		src.icon_state = "labcoat_red_open"
+		usr << "You unbutton the labcoat."
+	else if(src.icon_state == "labcoat_cdc_open")
+		src.icon_state = "labcoat_cdc"
+		usr << "You button up the labcoat."
+	else if(src.icon_state == "labcoat_cdc")
+		src.icon_state = "labcoat_cdc_open"
 		usr << "You unbutton the labcoat."
-
 	else
 		usr << "Sorry! The suit you're wearing doesn't have buttons!"
 	usr.update_clothing()

code/modules/clothing/jumpsuit.dm

@@ -531,22 +531,6 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	armor = list(melee = 100, bullet = 100, laser = 100,energy = 100, bomb = 100, bio = 100, rad = 100)
 
-/obj/item/clothing/under/rank/medical_sleeve
-	desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personnel."
-	name = "short sleeve medical jumpsuit"
-	icon_state = "medical_sleeve"
-	item_state = "w_suit"
-	color = "medical_sleeve"
-	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-
-/obj/item/clothing/under/jumpsuitdown
-	desc = "A rolled down jumpsuit. Great for mechanics."
-	name = "rolled down jumpsuit"
-	icon_state = "jumpsuitdown"
-	item_state = "jumpsuitdown"
-	color = "jumpsuitdown"
-
 // Cheerleader outfits or something
 /obj/item/clothing/under/cheerleader
 	name = "cheerleader uniform"

code/modules/clothing/suits/labcoat.dm

@@ -45,13 +45,3 @@
 	name = "Scientist Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a purple stripe on the shoulder."
 	icon_state = "labcoat_tox_open"
-
-/obj/item/clothing/suit/storage/labcoat/pink
-	name = "Pink Labcoat"
-	desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders."
-	icon_state = "labcoat_pink_open"
-
-/obj/item/clothing/suit/storage/labcoat/red
-	name = "Red Labcoat"
-	desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
-	icon_state = "labcoat_sleeve_open"

code/modules/customitems/item_defines.dm

@@ -1,15 +1,86 @@
-//add custom items you give to people here, and put their icons in custom_items.dmi
+// Add custom items you give to people here, and put their icons in custom_items.dmi
+// Remember to change 'icon = 'custom_items.dmi'' for items not using /obj/item/fluff as a base
+// Clothing item_state doesn't use custom_items.dmi. Just add them to the normal clothing files.
+
 /obj/item/fluff // so that they don't spam up the object tree
 	icon = 'custom_items.dmi'
 	w_class = 1.0
 
-/obj/item/fluff/wes_solari_1
+//////////// Clothing
-	name = "Family Photograph"
+
-	desc = "A family photograph of a couple and a young child, Written on the back it says \"See you soon Dad -Roy\"."
+/obj/item/clothing/glasses/meson/fluff/book_berner_1
-	icon_state = "wes_solari_1"
+	name = "bespectacled mesonic surveyors"
+	desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts."
+	icon = 'custom_items.dmi'
+	icon_state = "book_berner_1"
+
+/obj/item/clothing/glasses/fluff/serithi_artalis_1
+	name = "extranet HUD"
+	desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records."
+	icon = 'custom_items.dmi'
+	icon_state = "serithi_artalis_1"
+
+/obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1
+	name = "old hard hat"
+	desc = "An old dented hard hat with the nametag \"Anderson\". It seems to be backwards."
+	icon_state = "hardhat0_dblue" //Already an in-game sprite
+	item_state = "hardhat0_dblue"
+	color = "dblue"
+
+/obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit
+	name = "\improper CDC jumpsuit"
+	desc = "A modified standard-issue CDC jumpsuit made of a special fiber that gives special protection against biohazards.  It has a biohazard symbol sewn into the back."
+	icon = 'custom_items.dmi'
+	icon_state = "cdc_jumpsuit"
+	color = "cdc_jumpsuit"
+
+/obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat
+	name = "\improper CDC labcoat"
+	desc = "A standard-issue CDC labcoat that protects against minor chemical spills.  It has the name \"Wiles\" sewn on to the breast pocket."
+	icon = 'custom_items.dmi'
+	icon_state = "labcoat_cdc_open"
+
+/obj/item/clothing/suit/storage/labcoat/fluff/pink
+	name = "pink labcoat"
+	desc = "A suit that protects against minor chemical spills. Has a pink stripe down from the shoulders."
+	icon = 'custom_items.dmi'
+	icon_state = "labcoat_pink_open"
+
+/obj/item/clothing/suit/storage/labcoat/fluff/red
+	name = "red labcoat"
+	desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
+	icon = 'custom_items.dmi'
+	icon_state = "labcoat_red_open"
+
+/obj/item/clothing/under/rank/medical/fluff/short
+	name = "short sleeve medical jumpsuit"
+	desc = "Made of a special fiber that gives special protection against biohazards. Has a cross on the chest denoting that the wearer is trained medical personnel and short sleeves."
+	icon = 'custom_items.dmi'
+	icon_state = "medical_short"
+	color = "medical_short"
+
+/obj/item/clothing/under/fluff/jumpsuitdown
+	name = "rolled down jumpsuit"
+	desc = "A rolled down jumpsuit. Great for mechanics."
+	icon = 'custom_items.dmi'
+	icon_state = "jumpsuitdown"
+	item_state = "jumpsuitdown"
+	color = "jumpsuitdown"
+
+//////////// Useable Items
+
+/obj/item/weapon/pen/fluff/multi
+	name = "multicolor pen"
+	desc = "It's a cool looking pen. Lots of colors!"
+
+/obj/item/weapon/pen/fluff/fancypen
+	name = "multicolor pen"
+	desc = "A fancy metal pen. It uses blue ink. An inscription on one side reads,\"L.L. - L.R.\""
+	icon = 'custom_items.dmi'
+	icon_state = "fancypen"
 
 /obj/item/fluff/victor_kaminsky_1
-	name = "\improper Golden Detective's Badge"
+	name = "golden detective's badge"
 	desc = "NanoTrasen Security Department detective's badge, made from gold. Badge number is 564."
 	icon_state = "victor_kaminsky_1"
 
@@ -18,45 +89,41 @@
 		O.show_message(text("[] shows you: \icon[] [].", user, src, src.name), 1)
 	src.add_fingerprint(user)
 
+/obj/item/weapon/clipboard/fluff/smallnote
+	name = "small notebook"
+	desc = "A generic small spiral notebook that flips upwards."
+	icon = 'custom_items.dmi'
+	icon_state = "smallnotetext"
+
+/obj/item/weapon/storage/fluff/maye_daye_1
+	name = "pristine lunchbox"
+	desc = "A pristine stainless steel lunch box. The initials M.D. are engraved on the inside of the lid."
+	icon = 'custom_items.dmi'
+	icon_state = "maye_daye_1"
+
+//////////// Misc Items
+
+/obj/item/fluff/wes_solari_1
+	name = "family photograph"
+	desc = "A family photograph of a couple and a young child, Written on the back it says \"See you soon Dad -Roy\"."
+	icon_state = "wes_solari_1"
+
 /obj/item/fluff/sarah_calvera_1
-	name = "Old Photo"
+	name = "old photo"
 	desc = "Looks like it was made on a really old, cheap camera. Low quality. The camera shows a young hispanic looking girl with red hair wearing a white dress is standing in front of an old looking wall. On the back there is a note in black marker that reads \"Sara, Siempre pensé que eras tan linda con ese vestido. Tu hermano, Carlos.\""
 	icon_state = "sarah_calvera_1"
 
 /obj/item/fluff/angelo_wilkerson_1
-	name = "Fancy Watch"
+	name = "fancy watch"
 	desc = "An old and expensive pocket watch. Engraved on the bottom is \"Odium est Source De Dolor\". On the back, there is an engraving that does not match the bottom and looks more recent. \"Angelo, If you find this, you shall never see me again. Please, for your sake, go anywhere and do anything but stay. I'm proud of you and I will always love you. Your father, Jacob Wilkerson.\" Jacob Wilkerson... Wasn't he that serial killer?"
 	icon_state = "angelo_wilkerson_1"
 
-/obj/item/clothing/glasses/meson/fluff/book_berner_1
-	name = "Bespectacled Mesonic Surveyors"
-	desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts."
-	icon = 'custom_items.dmi'
-	icon_state = "book_berner_1"
-
 /obj/item/fluff/sarah_carbrokes_1
-	name = "Locket"
+	name = "locket"
 	desc = "A grey locket with a picture of a black haired man in it. The text above it reads: \"Edwin Carbrokes\"."
 	icon_state = "sarah_carbrokes_1"
 
-/obj/item/clothing/glasses/fluff/serithi_artalis_1
-	name = "Extranet HUD"
-	desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records."
-	icon_state = "serithi_artalis_1"
-
-/obj/item/clothing/head/fluff/greg_anderson_1
-	name = "old hard hat"
-	desc = "An old dented hard hat with the nametag \"Anderson\".  It seems to be backwards."
-	icon_state = "hardhat0_red"
-	flags = FPRINT | TABLEPASS | SUITSPACE
-	item_state = "hardhat0_red"
-	color = "red"
-	armor = list(melee = 30, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20)
-	flags_inv = 0
-
 /obj/item/fluff/ethan_way_1
-	name = "Old ID"
+	name = "old ID"
 	desc = "A scratched and worn identification card; it appears too damaged to inferface with any technology. You can almost make out \"Tom Cabinet\" in the smeared ink."
-	icon = 'custom_items.dmi'
 	icon_state = "ethan_way_1"
-	flags = FPRINT | TABLEPASS

config/custom_items.txt

@@ -1,9 +1,9 @@
-spaceman96: Trenna Seber: /obj/item/weapon/pen/multi, /obj/item/clothing/suit/storage/labcoat/pink
+spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/storage/labcoat/fluff/pink
 asanadas: Book Berner: /obj/item/clothing/under/chameleon/psyche, /obj/item/clothing/glasses/meson/fluff/book_berner_1
 tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
 eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
-searif: Yuki Matsuda: /obj/item/weapon/paper/certificate, /obj/item/clothing/under/jumpsuitdown
+searif: Yuki Matsuda: /obj/item/weapon/paper/certificate, /obj/item/clothing/under/fluff/jumpsuitdown
-erthilo: Farah Lants: /obj/item/clothing/under/rank/medical_sleeve, /obj/item/clothing/suit/storage/labcoat/red, /obj/item/weapon/storage/backpack/medicalsatchel
+erthilo: Farah Lants: /obj/item/clothing/under/rank/medical/fluff/short, /obj/item/clothing/suit/storage/labcoat/fluff/red
 compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
 tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
 misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
@@ -12,5 +12,8 @@ fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1
 fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1
 gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1
 serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1
-deusdactyl: Greg Anderson: /obj/item/clothing/head/fluff/greg_anderson_1
+deusdactyl: Greg Anderson: /obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1
-whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
+whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
+morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1
+lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote
+lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote