diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index ef92c846b88..82ce6cbed30 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -6,147 +6,9 @@
 	icon = 'custom_items.dmi'
 	w_class = 1.0
 
-//////////// Clothing
-
-/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/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"
-
-/obj/item/clothing/under/fluff/olddressuniform
-	name = "retired dress uniform"
-	desc = "A retired Station Head of Staff uniform, phased out twenty years ago for the newer jumpsuit design, but still acceptable dress. Lovingly maintained."
-	icon = 'custom_items.dmi'
-	icon_state = "olddressuniform"
-	item_state = "olddressuniform"
-	color = "olddressuniform"
-
-/obj/item/clothing/suit/storage/det_suit/fluff/graycoat
-	name = "gray coat"
-	desc = "Old, worn out coat. It's seen better days."
-	icon = 'custom_items.dmi'
-	icon_state = "graycoat"
-	item_state = "graycoat"
-	color = "graycoat"
-
-//////////// 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 = "fancy 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 = "golden detective's badge"
-	desc = "NanoTrasen Security Department detective's badge, made from gold. Badge number is 564."
-	icon_state = "victor_kaminsky_1"
-
-/obj/item/fluff/victor_kaminsky_1/attack_self(mob/user as mob)
-	for(var/mob/O in viewers(user, null))
-		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"
-
-/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
-	name = "vintage thermos"
-	desc = "An older thermos with a faint shine."
-	icon = 'custom_items.dmi'
-	icon_state = "johann_erzatz_1"
-	volume = 50
-
-/obj/item/weapon/lighter/zippo/fluff/li_tsun_1
-	name = "blue zippo lighter"
-	desc = "A zippo lighter made of some blue metal."
-	icon = 'custom_items.dmi'
-	icon_state = "bluezippo"
-	icon_on = "bluezippoon"
-	icon_off = "bluezippo"
-
-/obj/item/weapon/fluff/cado_keppel_1
-	name = "purple comb"
-	desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."
-	w_class = 1.0
-	icon = 'custom_items.dmi'
-	icon_state = "purplecomb"
-	item_state = "purplecomb"
-
-	attack_self(mob/user)
-		if(user.r_hand == src || user.l_hand == src)
-			for(var/mob/O in viewers(user, null))
-				O.show_message(text("\red [] uses their [] to comb their hair with incredible style and sophistication. What a guy.", user, src), 1)
-		return
-
-//////////// Misc Items
+//////////////////////////////////
+////////// Fluff Items ///////////
+//////////////////////////////////
 
 /obj/item/fluff/wes_solari_1
 	name = "family photograph"
@@ -177,3 +39,209 @@
 	name = "rosary pendant"
 	desc = "A cross on a ring of beads, has McNeil etched onto the back."
 	icon_state = "val_mcneil_1"
+
+//////////////////////////////////
+////////// Usable Items //////////
+//////////////////////////////////
+
+/obj/item/weapon/pen/fluff/multi //spaceman96: Trenna Seber
+	name = "multicolor pen"
+	desc = "It's a cool looking pen. Lots of colors!"
+
+/obj/item/weapon/pen/fluff/fancypen //orangebottle: Lillian Levett, Lilliana Reade
+	name = "fancy 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 //chinsky: Victor Kaminski
+	name = "golden detective's badge"
+	desc = "NanoTrasen Security Department detective's badge, made from gold. Badge number is 564."
+	icon_state = "victor_kaminsky_1"
+
+/obj/item/fluff/victor_kaminsky_1/attack_self(mob/user as mob)
+	for(var/mob/O in viewers(user, null))
+		O.show_message(text("[] shows you: \icon[] [].", user, src, src.name), 1)
+	src.add_fingerprint(user)
+
+/obj/item/weapon/clipboard/fluff/smallnote //lexusjjss: Lexus Langg, Zachary Tomlinson
+	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 //morrinn: Maye Day
+	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"
+
+/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1 //leonheart11:  Johann Erzatz
+	name = "vintage thermos"
+	desc = "An older thermos with a faint shine."
+	icon = 'custom_items.dmi'
+	icon_state = "johann_erzatz_1"
+	volume = 50
+
+/obj/item/weapon/lighter/zippo/fluff/li_tsun_1 //mangled: Li Tsun
+	name = "blue zippo lighter"
+	desc = "A zippo lighter made of some blue metal."
+	icon = 'custom_items.dmi'
+	icon_state = "bluezippo"
+	icon_on = "bluezippoon"
+	icon_off = "bluezippo"
+
+/obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel
+	name = "purple comb"
+	desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side."
+	w_class = 1.0
+	icon = 'custom_items.dmi'
+	icon_state = "purplecomb"
+	item_state = "purplecomb"
+
+	attack_self(mob/user)
+		if(user.r_hand == src || user.l_hand == src)
+			for(var/mob/O in viewers(user, null))
+				O.show_message(text("\red [] uses their [] to comb their hair with incredible style and sophistication. What a guy.", user, src), 1)
+		return
+
+/obj/item/weapon/camera_test/fluff/orange
+	name = "orange camera"
+	icon = 'custom_items.dmi'
+	desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black."
+	icon_state = "orangecamera"
+	pictures_left = 30
+
+//////////////////////////////////
+//////////// Clothing ////////////
+//////////////////////////////////
+
+//////////// Eye Wear ////////////
+
+/obj/item/clothing/glasses/meson/fluff/book_berner_1 //asanadas: Book Berner
+	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 //serithi: Serithi Artalis
+	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"
+
+//////////// Hats ////////////
+
+/obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1 //deusdactyl: Greg Anderson
+	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/head/secsoft/fluff/swatcap //deusdactyl: James Girard
+	name = "\improper SWAT hat"
+	desc = "A black hat.  The inside has the words, \"Lieutenant James Girard, LPD SWAT Team Four.\""
+	icon = 'custom_items.dmi'
+	icon_state = "swatcap"
+
+//////////// Suits ////////////
+
+/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/det_suit/fluff/graycoat
+	name = "gray coat"
+	desc = "Old, worn out coat. It's seen better days."
+	icon = 'custom_items.dmi'
+	icon_state = "graycoat"
+	item_state = "graycoat"
+	color = "graycoat"
+
+//////////// Uniforms ////////////
+
+/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"
+
+/obj/item/clothing/under/fluff/olddressuniform
+	name = "retired dress uniform"
+	desc = "A retired Station Head of Staff uniform, phased out twenty years ago for the newer jumpsuit design, but still acceptable dress. Lovingly maintained."
+	icon = 'custom_items.dmi'
+	icon_state = "olddressuniform"
+	item_state = "olddressuniform"
+	color = "olddressuniform"
+
+//////////// Masks ////////////
+
+/obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell
+	name = "\improper First Nations facemask"
+	desc = "A simple cloth rag that bears the flag of the first nations."
+	icon = 'custom_items.dmi'
+	icon_state = "flagmask"
+	item_state = "flagmask"
+	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
+	w_class = 2
+	gas_transfer_coefficient = 0.90
+
+//////////// Sets ////////////
+
+////// CDC
+
+/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"
+
+////// Short Sleeve Medical Outfit
+
+/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/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"
+
+////// Retired Patrol Outfit
+
+/obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat
+	name = "retired colony patrolman's coat"
+	desc = "A clean, black nylon windbreaker with the words \"OUTER LIGHT POLICE\" embroidered in gold-dyed thread on the back. \"RETIRED\" is tastefully embroidered below in a smaller font."
+	icon = 'custom_items.dmi'
+	icon_state = "retpolcoat"
+	item_state = "retpolcoat"
+	color = "retpolcoat"
+
+/obj/item/clothing/head/det_hat/fluff/retpolcap
+	name = "retired colony patrolman's cap"
+	desc = "A clean and properly creased colony police cap. The badge is shined and polished, the word \"RETIRED\" engraved professionally under the words \"OUTER LIGHT POLICE.\""
+	icon = 'custom_items.dmi'
+	icon_state = "retpolcap"
+
+/obj/item/clothing/under/det/fluff/retpoluniform
+	name = "retired colony patrolman's uniform"
+	desc = "A meticulously clean police uniform belonging to Precinct 31, Outer Light Colony. The word \"RETIRED\" is engraved tastefully and professionally in the badge below the number, 501."
+	icon = 'custom_items.dmi'
+	icon_state = "retpoluniform"
+	color = "retpoluniform"
diff --git a/config/custom_items.txt b/config/custom_items.txt
index 92731d7a606..dbb50c7ae40 100644
--- a/config/custom_items.txt
+++ b/config/custom_items.txt
@@ -1,28 +1,42 @@
-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/fluff/jumpsuitdown
-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
 chinsky: Victor Kaminski: /obj/item/fluff/victor_kaminsky_1
-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
+chinsky: Summer Springfield: /obj/item/weapon/camera_test/fluff/orange
+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
 deusdactyl: Greg Anderson: /obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1
-whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
-morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1
+deusdactyl: Roger Wiles: /obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit, /obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat
+deusdactyl: James Girard: /obj/item/clothing/head/secsoft/fluff/swatcap
+eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
+erthilo: Farah Lants: /obj/item/clothing/under/rank/medical/fluff/short, /obj/item/clothing/suit/storage/labcoat/fluff/red
+gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1
+leonheart11:  Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
 lexusjjss: Lexus Langg: /obj/item/weapon/clipboard/fluff/smallnote
 lexusjjss: Zachary Tomlinson: /obj/item/weapon/clipboard/fluff/smallnote
+mangled: Li Tsun: /obj/item/weapon/lighter/zippo/fluff/li_tsun_1
+misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
+morrinn: Maye Day: /obj/item/weapon/storage/fluff/maye_daye_1
 orangebottle: Lillian Levett: /obj/item/weapon/pen/fluff/fancypen
 orangebottle: Lilliana Reade: /obj/item/weapon/pen/fluff/fancypen
-deusdactyl: Roger Wiles: /obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit, /obj/item/clothing/suit/storage/labcoat/fluff/cdc_labcoat
+fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1
+fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1
 desiderium: Momiji Inubashiri: /obj/item/clothing/under/fluff/olddressuniform
-leonheart11:  Johann Erzatz: /obj/item/weapon/reagent_containers/food/drinks/flask/fluff/johann_erzatz_1
-mangled: Li Tsun: /obj/item/weapon/lighter/zippo/fluff/li_tsun_1
-vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
+desiderium: Rook Maudlin: /obj/item/clothing/suit/storage/det_suit/fluff/retpolcoat, /obj/item/clothing/head/det_hat/fluff/retpolcap, /obj/item/clothing/under/det/fluff/retpoluniform
+searif: Yuki Matsuda: /obj/item/clothing/under/fluff/jumpsuitdown
+searif: Tsiokeriio Tarbell: /obj/item/clothing/mask/fluff/flagmask
+serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1
+silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1
+spaceman96: Trenna Seber: /obj/item/weapon/pen/fluff/multi, /obj/item/clothing/suit/storage/labcoat/fluff/pink
 sparklysheep: Cado Keppel: /obj/item/weapon/fluff/cado_keppel_1
-silentthunder: Val McNeil: /obj/item/fluff/val_mcneil_1
\ No newline at end of file
+tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
+tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
+vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat
+whitellama: Ethan Way: /obj/item/fluff/ethan_way_1
+
+
+
+
+
+
+
+
+
+
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 4a3ed7a90ae..d3a0d3fbb92 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 d7b6cb7d6b2..e25a53373b8 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 368dc033ef5..906ea0a9e13 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 1f503ac05c8..d30f7a36a30 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 790669f50df..d6ed4ed2644 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 b3ae61bd778..9b015fb0a56 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 a3695c7087e..61b20090cef 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ