diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 3b150cf6a59..3a654380e7e 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -5542,7 +5542,7 @@
 "ccE" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; name = "HoP Office"; sortType = 15},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "ccF" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "ccG" = (/obj/machinery/keycard_auth{pixel_x = -24; pixel_y = 0},/obj/machinery/door/window{dir = 1; name = "Desk Door"; req_access_txt = "67"},/turf/simulated/floor/wood,/area/blueshield)
-"ccH" = (/obj/structure/table/woodentable,/obj/item/ashtray/glass{pixel_x = -4; pixel_y = -4},/obj/item/weapon/lighter/zippo/fluff/li_matsuda_1{pixel_x = 7; pixel_y = 4},/turf/simulated/floor{icon_state = "bcarpet05"},/area/blueshield)
+"ccH" = (/obj/structure/table/woodentable,/obj/item/ashtray/glass{pixel_x = -4; pixel_y = -4},/obj/item/weapon/lighter/zippo/blue{pixel_x = 7; pixel_y = 4},/turf/simulated/floor{icon_state = "bcarpet05"},/area/blueshield)
 "ccI" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/obj/item/weapon/pen/blue,/obj/item/weapon/folder/blue{pixel_x = 4; pixel_y = 6},/obj/item/weapon/paper/blueshield,/turf/simulated/floor{icon_state = "bcarpet05"},/area/blueshield)
 "ccJ" = (/obj/structure/sign/poster/legit{pixel_x = 32},/obj/machinery/photocopier,/turf/simulated/floor/wood,/area/blueshield)
 "ccK" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/wall,/area/ntrep)
diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm
index 874b5c0e10a..3648ed94b29 100644
--- a/_maps/map_files/cyberiad/z2.dmm
+++ b/_maps/map_files/cyberiad/z2.dmm
@@ -1537,7 +1537,7 @@
 "DC" = (/obj/structure/rack,/obj/item/clothing/head/bandana,/obj/item/clothing/head/ushanka,/obj/item/clothing/head/helmet/roman/legionaire,/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "DD" = (/obj/structure/rack,/obj/item/clothing/head/helmet/swat/syndicate{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/helmet/space/deathsquad,/obj/item/clothing/head/helmet/space/deathsquad/beret{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "DE" = (/obj/structure/rack,/obj/item/clothing/head/helmet/space/rig/wizard{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/helmet/space/rig/syndi,/obj/item/clothing/head/helmet/space/santahat{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
-"DF" = (/obj/structure/rack,/obj/item/clothing/head/welding/fluff/alice_mccrea_1{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/welding/fluff/norah_briggs_1,/obj/item/clothing/head/welding/fluff/yuki_matsuda_1{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
+"DF" = (/obj/structure/rack,/obj/item/clothing/head/welding/flamedecal{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/welding/flamedecal/blue,/obj/item/clothing/head/welding/fluff/yuki_matsuda_1{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "DG" = (/obj/structure/rack,/obj/item/clothing/head/soft/black{pixel_x = -3; pixel_y = 3},/obj/item/clothing/head/soft/blue,/obj/item/clothing/head/soft/red{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "DH" = (/obj/structure/rack,/obj/item/weapon/storage/backpack/holding,/obj/item/weapon/storage/backpack/duffel/clown,/obj/item/weapon/storage/backpack/duffel/captain,/obj/item/weapon/storage/backpack/duffel/science,/obj/item/weapon/storage/backpack/duffel/syndie/ammo,/obj/item/weapon/storage/backpack/duffel/syndie/med,/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "DI" = (/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/turf/unsimulated/wall{desc = "This window appears to be reinforced, it looks nearly impossible to break."; dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; name = "window"; opacity = 0; tag = "icon-window5_end (WEST)"},/area/admin)
@@ -1670,7 +1670,7 @@
 "Gf" = (/obj/machinery/computer/security{network = list("SS13","Telecomms","Research Outpost","Mining Outpost","ERT","CentCom","Thunderdome")},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Gg" = (/obj/machinery/computer/rdservercontrol{badmin = 1; name = "Master R&D Server Controller"},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Gh" = (/obj/machinery/r_n_d/server/centcom,/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
-"Gi" = (/obj/structure/table,/obj/item/weapon/card/id/silver{pixel_x = -3; pixel_y = -3},/obj/item/weapon/card/id/captains_spare,/obj/item/weapon/card/id/fluff/lifetime{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
+"Gi" = (/obj/structure/table,/obj/item/weapon/card/id/silver{pixel_x = -3; pixel_y = -3},/obj/item/weapon/card/id/captains_spare,/obj/item/weapon/card/id/lifetime{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Gj" = (/obj/structure/table,/obj/item/weapon/card/id/centcom{pixel_x = -3; pixel_y = -3},/obj/item/weapon/card/id{pixel_x = 0; pixel_y = 0},/obj/item/weapon/card/id/admin{pixel_x = 3; pixel_y = 3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Gk" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/turf/unsimulated/wall{dir = 2; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5"; name = "window"; opacity = 0; tag = "icon-window5"},/area/admin)
 "Gl" = (/obj/structure/stool/bed/chair/comfy/black,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/admin)
@@ -1686,7 +1686,7 @@
 "Gv" = (/obj/machinery/computer/artillerycontrol{luminosity = 255},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Gw" = (/obj/structure/stool/bed/chair{dir = 8},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Gx" = (/obj/item/weapon/stool,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/admin)
-"Gy" = (/obj/structure/table/woodentable,/obj/item/weapon/lighter/zippo/fluff/naples_1,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/admin)
+"Gy" = (/obj/structure/table/woodentable,/obj/item/weapon/lighter/zippo/engraved,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/admin)
 "Gz" = (/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/turf/unsimulated/wall{desc = "This window appears to be reinforced, it looks nearly impossible to break."; dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; name = "window"; opacity = 0; tag = "icon-window5 (EAST)"},/area/admin)
 "GA" = (/obj/machinery/computer/communications,/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "GB" = (/obj/structure/stool/bed/chair,/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm
index a5ce0d9979e..f895656d46a 100644
--- a/_maps/map_files/cyberiad/z6.dmm
+++ b/_maps/map_files/cyberiad/z6.dmm
@@ -43,7 +43,7 @@
 "aQ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "bar"},/area/djstation)
 "aR" = (/obj/machinery/light/small,/turf/simulated/floor{icon_state = "bar"},/area/djstation)
 "aS" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "bar"},/area/djstation)
-"aT" = (/obj/structure/table,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/weapon/lighter/zippo/fluff/naples_1,/obj/item/ashtray/glass{pixel_y = 7},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
+"aT" = (/obj/structure/table,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/weapon/lighter/zippo/engraved,/obj/item/ashtray/glass{pixel_y = 7},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
 "aU" = (/obj/structure/table,/obj/item/weapon/paper/djstation{info = "<B>Welcome new owner!</B><BR><BR>You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:<br><ol><li>Equip yourself with a multi-tool</li><li>Use the multitool on each machine, that is the broadcaster, receiver and the relay.</li><li>Turn all the machines on, it has already been configured for you to listen on.</li></ol> Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.<br><ul><li>145.7 - Common Channel</li><li>144.7 - Private AI Channel</li><li>135.9 - Security Channel</li><li>135.7 - Engineering Channel</li><li>135.5 - Medical Channel</li><li>135.3 - Command Channel</li><li>135.1 - Science Channel</li><li>134.7 - Supply Channel</li>"},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/djstation)
 "aV" = (/obj/structure/computerframe{anchored = 1},/turf/simulated/floor{icon_state = "grimy"},/area/djstation)
 "aW" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "grimy"},/area/djstation)
@@ -632,7 +632,7 @@
 "mh" = (/obj/structure/closet/crate{name = "foot locker"},/obj/item/ammo_box/magazine/m10mm{pixel_x = 4},/obj/item/weapon/gun/projectile/automatic/pistol,/obj/item/clothing/head/helmet/swat/syndicate,/obj/item/clothing/glasses/thermal{pixel_x = -3; pixel_y = 3},/obj/item/clothing/shoes/black{pixel_y = -4},/turf/simulated/floor{icon_state = "dark"},/area/syndicate_depot)
 "mi" = (/turf/simulated/floor{icon_state = "dark"},/area/syndicate_depot)
 "mj" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/red,/turf/simulated/floor{icon_state = "dark"},/area/syndicate_depot)
-"mk" = (/obj/structure/closet/crate{name = "foot locker"},/obj/item/ammo_box/magazine/smgm45{pixel_x = 3},/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate{pixel_x = -3; pixel_y = -2},/obj/item/weapon/lighter/zippo/fluff/executivekill_1,/obj/item/clothing/under/syndicate{pixel_x = 3; pixel_y = 3},/obj/item/clothing/suit/armor/vest/combat{pixel_x = -3; pixel_y = -3},/turf/simulated/floor{icon_state = "dark"},/area/syndicate_depot)
+"mk" = (/obj/structure/closet/crate{name = "foot locker"},/obj/item/ammo_box/magazine/smgm45{pixel_x = 3},/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate{pixel_x = -3; pixel_y = -2},/obj/item/weapon/lighter/zippo/gonzofist,/obj/item/clothing/under/syndicate{pixel_x = 3; pixel_y = 3},/obj/item/clothing/suit/armor/vest/combat{pixel_x = -3; pixel_y = -3},/turf/simulated/floor{icon_state = "dark"},/area/syndicate_depot)
 "ml" = (/turf/simulated/floor{icon_state = "dark"},/turf/unsimulated/wall{desc = "This window appears to be reinforced, it looks nearly impossible to break."; dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; name = "window"; opacity = 0; tag = "icon-window5_end (WEST)"},/area/syndicate_depot)
 "mm" = (/obj/machinery/gun_turret/interior,/turf/simulated/floor{icon_state = "dark"},/area/syndicate_depot)
 "mn" = (/obj/item/device/radio/intercom/syndicate{pixel_x = -28},/turf/simulated/floor{icon_state = "dark"},/area/syndicate_depot)
diff --git a/_maps/map_files/cyberiad/z8.dmm b/_maps/map_files/cyberiad/z8.dmm
index ae7a772a510..7ea368306ba 100644
--- a/_maps/map_files/cyberiad/z8.dmm
+++ b/_maps/map_files/cyberiad/z8.dmm
@@ -319,7 +319,7 @@
 "gg" = (/obj/machinery/optable,/obj/effect/decal/cleanable/blood,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/traitor/surgery)
 "gh" = (/obj/structure/table,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/traitor/surgery)
 "gi" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/traitor/radio)
-"gj" = (/obj/structure/table,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/weapon/lighter/zippo/fluff/naples_1,/obj/item/ashtray/glass{pixel_y = 7},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/traitor/radio)
+"gj" = (/obj/structure/table,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/obj/item/weapon/lighter/zippo/engraved,/obj/item/ashtray/glass{pixel_y = 7},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/traitor/radio)
 "gk" = (/obj/structure/table,/obj/item/weapon/paper/djstation{info = "<B>Welcome new owner!</B><BR><BR>You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:<br><ol><li>Equip yourself with a multi-tool</li><li>Use the multitool on each machine, that is the broadcaster, receiver and the relay.</li><li>Turn all the machines on, it has already been configured for you to listen on.</li></ol> Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.<br><ul><li>145.7 - Common Channel</li><li>144.7 - Private AI Channel</li><li>135.9 - Security Channel</li><li>135.7 - Engineering Channel</li><li>135.5 - Medical Channel</li><li>135.3 - Command Channel</li><li>135.1 - Science Channel</li><li>134.7 - Supply Channel</li>"},/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/traitor/radio)
 "gl" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/syndicate,/turf/simulated/floor{icon_state = "vault"; dir = 5},/area/traitor/surgery)
 "gm" = (/obj/machinery/bodyscanner,/turf/simulated/floor{icon_state = "vault"; dir = 8},/area/traitor/surgery)
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 2a9ae8f18ec..97de7c19e51 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -192,7 +192,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 			clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
-			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "deus_blueshield"), ICON_OVERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
 		if("Magistrate")
 			clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 9b193628eda..e113e525c04 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -128,7 +128,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		H.equip_or_collect(new /obj/item/weapon/melee/baton/loaded/ntcane(H.back), slot_in_backpack)
-		H.equip_or_collect(new /obj/item/weapon/lighter/zippo/fluff/nt_rep(H.back), slot_in_backpack)
+		H.equip_or_collect(new /obj/item/weapon/lighter/zippo/nt_rep(H.back), slot_in_backpack)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/ntrep(H), slot_w_uniform)
 		H.equip_if_possible(new /obj/item/clothing/suit/storage/ntrep(H), slot_wear_suit)
 		H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes)
@@ -173,7 +173,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 		H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes)
 		H.equip_or_collect(new /obj/item/clothing/glasses/hud/health_advanced, slot_glasses)
 		H.equip_if_possible(new /obj/item/clothing/under/rank/blueshield(H), slot_w_uniform)
-		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield(H), slot_wear_suit)
+		H.equip_if_possible(new /obj/item/clothing/suit/armor/vest/blueshield(H), slot_wear_suit)
 		H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store)
 		H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda)
 		if(H.backbag == 1)
diff --git a/code/game/mecha/paintkits.dm b/code/game/mecha/paintkits.dm
index 872138c9b40..da66d8181a7 100644
--- a/code/game/mecha/paintkits.dm
+++ b/code/game/mecha/paintkits.dm
@@ -1,8 +1,8 @@
 /obj/item/weapon/paintkit //Please don't use this for anything, it's a base type for custom mech paintjobs.
 	name = "mecha customisation kit"
 	desc = "A generic kit containing all the needed tools and parts to turn a mech into another mech."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "royce_kit"
+	icon = 'icons/obj/paintkit.dmi'
+	icon_state = "paintkit"
 
 	var/new_name = "mech"    //What is the variant called?
 	var/new_desc = "A mech." //How is the new mech described?
@@ -11,10 +11,9 @@
 	var/list/allowed_types = list() //Types of mech that the kit will work on.
 
 /obj/item/weapon/paintkit/titansfist
-	name = "Ripley customisation kit"
-	desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into a Titan's Fist worker mech."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "royce_kit"
+	name = "APLU \"Ripley\" customisation kit"
+	desc = "A kit containing all the needed tools and parts to turn an APLU \"Ripley\" into a Titan's Fist worker mech."
+	icon_state = "paintkit_2"
 
 	new_name = "APLU \"Titan's Fist\""
 	new_desc = "This ordinary mining Ripley has been customized to look like a unit of the Titans Fist."
@@ -22,10 +21,9 @@
 	allowed_types = list("ripley","firefighter")
 
 /obj/item/weapon/paintkit/mercenary
-	name = "Mercenary APLU kit"
-	desc = "A kit containing all the needed tools and parts to turn an APLU Ripley into an old Mercenaries APLU."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "sven_kit"
+	name = "Mercenary APLU \"Ripley\" kit"
+	desc = "A kit containing all the needed tools and parts to turn an APLU \"Ripley\" into an old Mercenaries APLU."
+
 
 	new_name = "APLU \"Strike the Earth!\""
 	new_desc = "Looks like an over worked, under maintained Ripley with some horrific damage."
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index f9de1b2cd6b..84fad33f60c 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -623,7 +623,12 @@
 	assignment = "Green Team Fighter"
 	icon_state = "TDgreen"
 	desc = "This ID card is given to those who fought inside the thunderdome for the Green Team. Not many have lived to see one of those, even fewer lived to keep it."
-
+	
+/obj/item/weapon/card/id/lifetime
+	name = "Lifetime ID Card"
+	desc = "A modified ID card given only to those people who have devoted their lives to the better interests of Nanotrasen. It sparkles blue."
+	icon_state = "lifetimeid"
+	
 // Decals
 /obj/item/weapon/id_decal
 	name = "identification card decal"
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index f5e281bbb32..4d8b07abc63 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -53,7 +53,7 @@
 /obj/item/weapon/implantpad/verb/remove_implant()
 	set category = "Object"
 	set name = "Remove Implant"
-	set src in view(1)
+	set src in usr
 	
 	if (usr.stat || usr.restrained())
 		return
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index acb4adbe1c7..31df6806d10 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -95,69 +95,40 @@
 	return
 
 //EXTRA LIGHTERS
-/obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda
+/obj/item/weapon/lighter/zippo/nt_rep
+	name = "gold engraved zippo"
+	desc = "An engraved golden Zippo lighter with the letters NT on it."
+	icon_state = "zippo_nt_off"
+	icon_on = "zippo_nt_on"
+	icon_off = "zippo_nt_off"
+	
+/obj/item/weapon/lighter/zippo/blue
 	name = "blue zippo lighter"
 	desc = "A zippo lighter made of some blue metal."
-	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "bluezippo"
 	icon_on = "bluezippoon"
 	icon_off = "bluezippo"
 
-/obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess
-	name = "engraved lighter"
-	desc = "A golden lighter, engraved with some ornaments and a G."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "guessip"
-	icon_on = "guessipon"
-	icon_off = "guessip"
-
-/obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin
-	name = "Riley's black zippo"
-	desc = "A black zippo lighter, which holds some form of sentimental value."
-	icon = 'icons/obj/custom_items.dmi'
+/obj/item/weapon/lighter/zippo/black 
+	name = "black zippo lighter"
+	desc = "A black zippo lighter."
 	icon_state = "blackzippo"
 	icon_on = "blackzippoon"
 	icon_off = "blackzippo"
 
-/obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan
-	name = "Graduation Lighter"
-	desc = "A silver engraved lighter with 41 on one side and Tharsis University on the other. The lid reads Fay Sullivan, Cybernetic Engineering, 2541"
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "gradzippo"
-	icon_on = "gradzippoon"
-	icon_off = "gradzippo"
-
-/obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
-	name = "Gonzo Fist zippo"
-	desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "gonzozippo"
-	icon_on = "gonzozippoon"
-	icon_off = "gonzozippo"
-
-/obj/item/weapon/lighter/zippo/fluff/naples_1 //naples: Russell Vierson
-	name = "Engraved zippo"
-	desc = "A intricately engraved Zippo lighter."
-	icon = 'icons/obj/custom_items.dmi'
+/obj/item/weapon/lighter/zippo/engraved 
+	name = "engraved zippo lighter"
+	desc = "A intricately engraved zippo lighter."
 	icon_state = "engravedzippo"
 	icon_on = "engravedzippoon"
 	icon_off = "engravedzippo"
-
-/obj/item/weapon/lighter/zippo/fluff/nt_rep
-	name = "gold engraved zippo"
-	desc = "An engraved golden Zippo lighter with the letters NT on it."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "zippo_nt_off"
-	icon_on = "zippo_nt_on"
-	icon_off = "zippo_nt_off"
-
-/obj/item/weapon/lighter/zippo/fluff/purple
-	name = "purple engraved zippo"
-	desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "purple_zippo_off"
-	icon_on = "purple_zippo_on"
-	icon_off = "purple_zippo_off"
+	
+/obj/item/weapon/lighter/zippo/gonzofist
+	name = "Gonzo Fist zippo"
+	desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
+	icon_state = "gonzozippo"
+	icon_on = "gonzozippoon"
+	icon_off = "gonzozippo"
 
 ///////////
 //MATCHES//
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index a227b2979c1..4432d93fcb5 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -809,6 +809,12 @@
 		</html>
 
 		"}
+		
+/obj/item/weapon/book/manual/security_space_law/black
+	name = "Space Law - Limited Edition"
+	desc = "A leather-bound, immaculately-written copy of JUSTICE."
+	icon_state = "bookSpaceLawblack"
+	title = "Space Law - Limited Edition"
 
 /obj/item/weapon/book/manual/engineering_guide
 	name = "Engineering Textbook"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index cec85a0c694..6b2da40c7f5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -250,7 +250,7 @@
 		new /obj/item/clothing/glasses/sunglasses(src)
 		new /obj/item/clothing/glasses/hud/health_advanced
 		new /obj/item/clothing/head/beret/centcom/officer(src)
-		new /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield(src)
+		new /obj/item/clothing/suit/armor/vest/blueshield(src)
 		new /obj/item/clothing/suit/storage/blueshield(src)
 		new /obj/item/clothing/shoes/centcom(src)
 		new /obj/item/clothing/accessory/holster(src)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index f744b9fa26b..d3776c15370 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -30,11 +30,20 @@
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/head.dmi'
 		)
+		
+/obj/item/clothing/head/welding/flamedecal
+	name = "flame decal welding helmet"
+	desc = "A welding helmet adorned with flame decals, and several cryptic slogans of varying degrees of legibility."
+	icon_state = "welding_redflame"
+
+/obj/item/clothing/head/welding/flamedecal/blue
+	name = "blue flame decal welding helmet"
+	desc = "A welding helmet with blue flame decals on it."
+	icon_state = "welding_blueflame"	
 
 /obj/item/clothing/head/welding/attack_self()
 	toggle()
 
-
 /obj/item/clothing/head/welding/proc/toggle()
 	set src in usr
 
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 1ed9ffce30c..52f5e195d15 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -216,10 +216,17 @@
 /obj/item/clothing/mask/gas/sechailer/swat
 	name = "\improper SWAT mask"
 	desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000."
-	action_button_name = "HALT!"
 	icon_state = "officermask"
 	aggressiveness = 3
 	ignore_maskadjust = 1
+	
+/obj/item/clothing/mask/gas/sechailer/blue
+	name = "\improper blue SWAT mask"
+	desc = "A neon blue swat mask, used for demoralizing Greytide in the wild."
+	icon_state = "blue_sechailer"
+	item_state = "blue_sechailer"
+	aggressiveness = 3
+	ignore_maskadjust = 1
 
 /obj/item/clothing/mask/gas/sechailer/cyborg
 	name = "security hailer"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 7221e0c069e..5fbb5495aad 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -131,4 +131,12 @@
 	desc = "A pair of costume boots fashioned after bird talons."
 	icon_state = "griffinboots"
 	item_state = "griffinboots"
-	flags = NODROP
\ No newline at end of file
+	flags = NODROP
+	
+/obj/item/clothing/shoes/fluff/noble_boot
+	name = "noble boots"
+	desc = "The boots are economically designed to balance function and comfort, so that you can step on peasants without having to worry about blisters. The leather also resists unwanted blood stains."
+	icon_state = "noble_boot"
+	_color = "noble_boot"
+	item_state = "noble_boot"
+	
\ No newline at end of file
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index f51537e5280..eb777e41ffe 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -8,7 +8,6 @@
 	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
 	siemens_coefficient = 0.6
 
-
 /obj/item/clothing/suit/armor/vest
 	name = "armor"
 	desc = "An armored vest that protects against some damage."
@@ -39,6 +38,18 @@
 	desc = "An armored vest that protects against some damage. This one has Nanotrasen corporate badge."
 	icon_state = "armorsec"
 	item_state = "armor"
+	
+/obj/item/clothing/suit/armor/vest/blueshield
+	name = "blueshield security armor"
+	desc = "An armored vest with the badge of a Blueshield Lieutenant."
+	icon_state = "blueshield"
+	item_state = "blueshield"
+	
+/obj/item/clothing/suit/armor/vest/bloody
+	name = "bloodied security armor"
+	desc = "A vest drenched in the blood of Greytide. It has seen better days."
+	icon_state = "bloody_armor"
+	item_state = "bloody_armor"
 
 /obj/item/clothing/suit/armor/hos
 	name = "armored coat"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 0c50f0fcdbb..66d00261ac6 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -504,4 +504,12 @@
 	desc = "You'll be the Ruler of the King's Navy in no time."
 	icon_state = "lordadmiral"
 	item_state = "lordadmiral"
-	allowed = list (/obj/item/weapon/gun)
\ No newline at end of file
+	allowed = list (/obj/item/weapon/gun)
+	
+/obj/item/clothing/suit/fluff/noble_coat
+	name = "noble coat"
+	desc = "The livid blues, purples and greens are awesome enough to evoke a visceral response in you; it is not dissimilar to indigestion."
+	icon_state = "noble_coat"
+	item_state = "noble_coat"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	
\ No newline at end of file
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 39aeeced2be..704746d851d 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -675,3 +675,10 @@
 	icon_state = "griffin"
 	_color = "griffin"
 	flags = NODROP
+
+/obj/item/clothing/under/noble_clothes
+	name = "noble clothes"
+	desc = "They fall just short of majestic."
+	icon_state = "noble_clothes"
+	_color = "noble_clothes"
+	item_state = "noble_clothes"
diff --git a/code/modules/customitems/definitions/N3X15.dm b/code/modules/customitems/definitions/N3X15.dm
deleted file mode 100644
index 6f0b5ad0538..00000000000
--- a/code/modules/customitems/definitions/N3X15.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-* N3X15's Testing Shit
-*
-* Used to test this on /fail/station.  Not used, so left out.  A decent example though.
-*/
-
-/obj/item/clothing/suit/storage/labcoat/custom/N3X15
-	icon = 'icons/mob/custom/N3X15/suits.dmi'
-	custom = 1
-
-/obj/item/clothing/suit/storage/labcoat/custom/N3X15/robotics
-	name = "Robotics Research Labcoat"
-	desc = "A suit that protects against nothing, but looks fashionable. Well, apart from the crappy portrait drawn on the back with permanent marker."
-	base_icon_state = "labcoat_tox"
-
-
-
-/obj/item/clothing/under/custom/N3X15
-	icon = 'icons/mob/custom/N3X15/suits.dmi' // Cheating.
-	custom = 1
-
-/obj/item/clothing/under/custom/N3X15/robotics
-	desc = "It's slimming black with reinforced seams; great for industrial work."
-	name = "roboticist's jumpsuit"
-	icon_state = "robotics"
-	item_state = "robotics"
-	color = "robotics"
\ No newline at end of file
diff --git a/code/modules/customitems/definitions/base.dm b/code/modules/customitems/definitions/base.dm
deleted file mode 100644
index 75d11d07aab..00000000000
--- a/code/modules/customitems/definitions/base.dm
+++ /dev/null
@@ -1,23 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-// ALL CUSTOM ITEMS MUST USE THEIR OWN DMI SO IT DOESN'T FUCK UP THE TREE.
-//
-// FOR FUCK'S SAKE, DO NOT ADD IN YOUR TERRIBLE FUCKING CUSTOM ITEMS TO BASE DMIS.
-//
-// GOOD IDEA:
-//
-//  icons/
-//    mob/
-//      custom/
-//        N3X15.dmi
-//
-//
-// FUCKING NO:
-//
-//   icons/
-//     mob/
-//       head.dmi
-//
-// *** IF I SEE THIS SORT OF SHIT IN THE TREE I WILL NOT ACCEPT YOUR PULL. ***
-////////////////////////////////////////////////////////////////////////////////
-
-/obj/item/var/custom=0 // Set to override DMI locations in creature overlays, etc.
\ No newline at end of file
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index d5203ecb267..ec3c1133c33 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -2,80 +2,15 @@
 // 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 = 'icons/obj/custom_items.dmi'
-	w_class = 1.0
-
-
-
 ///////////////////////////////////////////////////////////////////////
-/////////////////////PARADISE STATION CUSTOM ITEMS////////////////////
-//////////////////////////////////////////////////////////////////////
-
-/obj/item/clothing/head/fluff/heather_winceworth // regens: Heather Winceworth
-	name= "Heather's rose"
-	desc= "A beautiful purple rose for your hair."
-	icon= 'icons/obj/clothing/hats.dmi'
-	icon_state = "hairflowerp"
-	item_state = "hairflowerp"
-
-/obj/item/clothing/under/fluff/WornTurtleneck // DaveTheHeadcrab: Makkota Atani
-	name = "Worn Combat Turtleneck"
-	desc = "A worn out turtleneck with 'J.C. NSS Regnare' stitched on the inside of the collar. The tag reveals it to be 99% NanoCotton."
-	icon= 'icons/obj/clothing/uniforms.dmi'
-	icon_state = "syndicate"
-	item_state = "bl_suit"
-	_color = "syndicate"
-	has_sensor = 1 // Jumpsuit has no sensor by default
-	displays_id = 0 // Purely astetic, the ID does not show up on the player sprite when equipped. Examining still reveals it.
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Standard Security jumpsuit stats
-	siemens_coefficient = 0.
-
-/obj/item/clothing/under/fluff/blackschoolGirl // Black schoolgirl uniform
-	name = "Black Schoolgirl Uniform"
-	desc = "A Japanese style school uniform for girls"
-	icon= 'icons/obj/clothing/uniforms.dmi'
-	icon_state = "schoolgirl_black"
-	_color = "schoolgirl_black"
-	item_state = "schoolgirl_black"
-	has_sensor = 1 // Just to make sure it has a sensor
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Standar Jumpsuit stats
-
-/obj/item/clothing/head/fluff/sparkyninja_beret //Sparkyninja: Neil Wilkinson
-	name = "royal marines commando beret"
-	desc = "Dark Green beret with an old insignia on it."
-	icon_state = "sparkyninja_beret"
-
-/obj/item/weapon/book/manual/security_space_law/black
-	name = "Space Law - Limited Edition"
-	desc = "A leather-bound, immaculately-written copy of JUSTICE."
-	icon_state = "bookSpaceLawblack"
-	title = "Space Law - Limited Edition"
+/////////////////////PARADISE STATION CUSTOM ITEMS/////////////////////
+///////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////
 ////////// Usable Items //////////
 //////////////////////////////////
 
-/obj/item/weapon/pen/fluff/fountainpen //paththegreat: Eli Stevens
-	name = "Engraved Fountain Pen"
-	desc = "An expensive looking pen with the initials E.S. engraved into the side."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "fountainpen"
-
-/obj/item/weapon/card/id/fluff/lifetime	//fastler: Fastler Greay; it seemed like something multiple people would have
-	name = "Lifetime ID Card"
-	desc = "A modified ID card given only to those people who have devoted their lives to the better interests of Nanotrasen. It sparkles blue."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "lifetimeid"
-
-/obj/item/weapon/crowbar/fluff/zelda_creedy_1 //daaneesh: Zelda Creedy
-	name = "Zelda's Crowbar"
-	desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "zeldacrowbar"
-	item_state = "crowbar"
-
-/obj/item/weapon/claymore/fluff //MrBarrelrolll: Maximus Greenwood
+/obj/item/weapon/claymore/fluff // MrBarrelrolll: Maximus Greenwood
 	name = "Greenwood's Blade"
 	desc = "A replica claymore with strange markings scratched into the blade."
 	force = 5
@@ -85,37 +20,62 @@
 /obj/item/weapon/claymore/fluff/IsShield()
 	return 0
 
+/obj/item/weapon/pen/fluff/fountainpen // Froststahr: Viktor Romanov
+	name = "Engraved Fountain Pen"
+	desc = "An expensive looking pen with the initials E.S. engraved into the side."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "fountainpen"	
+	
+/obj/item/weapon/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley
+	name = "Zelda's Crowbar"
+	desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "zeldacrowbar"
+	item_state = "crowbar"
+	
+/obj/item/clothing/glasses/meson/fluff/book_berner_1 // Adrkiller59: Adam Cooper
+	name = "bespectacled mesonic surveyors"
+	desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "book_berner_1"
+	
+/obj/item/weapon/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad
+	name = "purple engraved zippo"
+	desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "purple_zippo_off"
+	icon_on = "purple_zippo_on"
+	icon_off = "purple_zippo_off"
+	
+/obj/item/weapon/lighter/zippo/fluff/michael_guess_1 // mrbits: Callista Gold
+	name = "engraved lighter"
+	desc = "A golden lighter, engraved with some ornaments and a G."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "guessip"
+	icon_on = "guessipon"
+	icon_off = "guessip"
+	
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////
 
 //////////// Gloves ////////////
+
 //////////// 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 = 'icons/obj/custom_items.dmi'
-	icon_state = "book_berner_1"
-
 //////////// Hats ////////////
-/obj/item/clothing/head/welding/fluff/alice_mccrea_1 //madmalicemccrea: Alice McCrea
-	name = "flame decal welding helmet"
-	desc = "A welding helmet adorned with flame decals, and several cryptic slogans of varying degrees of legibility. \"Fly the Friendly Skies\" is clearly visible, written above the visor, for some reason."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "alice_mccrea_1"
-
-/obj/item/clothing/head/welding/fluff/yuki_matsuda_1 //searif: Yuki Matsuda
+/obj/item/clothing/head/welding/fluff/yuki_matsuda_1 // Shadeykins: Dusk
 	name = "white decal welding helmet"
 	desc = "A white welding helmet with a character written across it."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "yuki_matsuda_1"
-
-/obj/item/clothing/head/welding/fluff/norah_briggs_1 //bountylord13: Norah Briggs
-	name = "blue flame decal welding helmet"
-	desc = "A welding helmet with blue flame decals on it."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "norah_briggs_1"
+	
+/obj/item/clothing/head/fluff/heather_winceworth // Regens: Heather Winceworth
+	name= "Heather's rose"
+	desc= "A beautiful purple rose for your hair."
+	icon= 'icons/obj/clothing/hats.dmi'
+	icon_state = "hairflowerp"
+	item_state = "hairflowerp"
 
 /obj/item/clothing/head/bearpelt/fluff/polar //Gibson1027: Sploosh
 	name = "polar bear pelt hat"
@@ -123,31 +83,27 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "polarbearpelt"
 	item_state = "polarbearpelt"
-
+	
+/obj/item/clothing/head/fluff/sparkyninja_beret // Sparkyninja: Neil Wilkinson
+	name = "royal marines commando beret"
+	desc = "Dark Green beret with an old insignia on it."
+	icon_state = "sparkyninja_beret"
+	
 //////////// Suits ////////////
-
-/obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Robotics Labcoat - Aeneas Rinil [APPR]
+/obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Socialsystem: Lynn Fea
 	name = "Robotics labcoat"
 	desc = "A labcoat with a few markings denoting it as the labcoat of roboticist."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "aeneasrinil_open"
-
-/obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl
-	name = "blueshield security armor"
-	desc = "An armored vest with the badge of a Blueshield Lieutenant."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "deus_blueshield"
-	item_state = "deus_blueshield"
-
-/obj/item/clothing/suit/jacket/fluff/kidosvest //Anxipal: Kido Qasteth
+	
+/obj/item/clothing/suit/jacket/fluff/kidosvest // Anxipal: Kido Qasteth
 	name = "Kido's Vest"
 	desc = "A rugged leather vest with a tag labelled \"Men of Mayhem.\""
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "kidosvest"
 	item_state = "kidosvest"
 
-//Kluys fluff nanofibre suit
-/obj/item/clothing/suit/kluysfluff
+/obj/item/clothing/suit/kluysfluff // Kluys: Cripty Pandaen
 	name = "Nano Fibre Jacket"
 	desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials."
 	icon_state = "Kluysfluff1"
@@ -160,36 +116,58 @@
 	set category = "Object"
 	set src in usr
 
-	if(!usr.canmove || usr.stat || usr.restrained())
+	if(usr.stat || usr.restrained())
 		return 0
 
 	switch(icon_state)
 		if("Kluysfluff1")
 			src.icon_state = "Kluysfluff2"
-			usr << "The fibre unfolds into a jacket"
-		if("Kluysfluff2")
+			usr << "The fibre unfolds into a jacket."
+		else if("Kluysfluff2")
 			src.icon_state = "Kluysfluff3"
-			usr << "The fibre unfolds into a coat"
-		if("Kluysfluff3")
+			usr << "The fibre unfolds into a coat."
+		else if("Kluysfluff3")
 			src.icon_state = "Kluysfluff1"
 			usr << "The fibre gets sucked back into its holder."
 		else
-			usr << "You attempt to hit the button but can't"
+			usr << "You attempt to hit the button but can't."
 			return
-	usr.update_inv_wear_suit()	//so our overlays update
+	usr.update_inv_wear_suit()
+	
+/obj/item/clothing/suit/storage/labcoat/fluff/red // Sweetjealousy: Sophie Faust-Noms	
+	name = "red labcoat"
+	desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "labcoat_red_open"
 
 //////////// Uniforms ////////////
+/obj/item/clothing/under/fluff/WornTurtleneck // DaveTheHeadcrab: Makkota Atani
+	name = "Worn Combat Turtleneck"
+	desc = "A worn out turtleneck with 'J.C. NSS Regnare' stitched on the inside of the collar. The tag reveals it to be 99% NanoCotton."
+	icon= 'icons/obj/clothing/uniforms.dmi'
+	icon_state = "syndicate"
+	item_state = "bl_suit"
+	_color = "syndicate"
+	has_sensor = 1 // Jumpsuit has no sensor by default
+	displays_id = 0 // Purely astetic, the ID does not show up on the player sprite when equipped. Examining still reveals it.
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Standard Security jumpsuit stats
+	siemens_coefficient = 0
+
+/obj/item/clothing/under/fluff/kharshai // Kharshai: Athena Castile
+	name = "Castile formal outfit"
+	desc = "A white and gold formal uniform, accompanied by a small pin with the numbers '004' etched upon it."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "castile_dress"
+	item_state = "castile_dress"
+	_color = "castile_dress"
+	
 /obj/item/clothing/under/psysuit/fluff/isaca_sirius_1 // Xilia: Isaca Sirius
 	name = "Isaca's suit"
 	desc = "Black, comfortable and nicely fitting suit. Made not to hinder the wearer in any way. Made of some exotic fabric. And some strange glowing jewel at the waist. Name labels says; Property of Isaca Sirius; The Seeder."
 
-
-/////// NT-SID Suit //Zuhayr: Jane Doe
-
-/obj/item/clothing/under/fluff/jane_sidsuit
+/obj/item/clothing/under/fluff/jane_sidsuit // SyndiGirl: Zoey Scyth
 	name = "NT-SID jumpsuit"
 	desc = "A Nanotrasen Synthetic Intelligence Division jumpsuit, issued to 'volunteers'. On other people it looks fine, but right here a scientist has noted: on you it looks stupid."
-
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "jane_sid_suit"
 	item_state = "jane_sid_suit"
@@ -197,104 +175,49 @@
 	has_sensor = 2
 	sensor_mode = 3
 
-//Suit roll-down toggle.
 /obj/item/clothing/under/fluff/jane_sidsuit/verb/toggle_zipper()
 	set name = "Toggle Jumpsuit Zipper"
 	set category = "Object"
 	set src in usr
 
-	if(!usr.canmove || usr.stat || usr.restrained())
+	if(usr.stat || usr.restrained())
 		return 0
 
 	if(src.icon_state == "jane_sid_suit_down")
 		src._color = "jane_sid_suit"
-		usr << "You zip up the [src]."
+		usr << "You zip up \the [src]."
 	else
 		src._color = "jane_sid_suit_down"
-		usr << "You unzip and roll down the [src]."
+		usr << "You unzip and roll down \the [src]."
 
 	src.icon_state = "[_color]"
 	src.item_state = "[_color]"
 	usr.update_inv_w_uniform()
 
 //////////// Masks ////////////
+
 //////////// Shoes ////////////
+
 //////////// Sets ////////////
-
-////// Short Sleeve Medical Outfit //erthilo: Farah Lants
-
-/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."
+// Fox P McCloud: Fox McCloud
+/obj/item/clothing/suit/jacket/fluff/fox
+	name = "Aeronautics Jacket"
+	desc = "An aviator styled jacket made from a peculiar material; this one seems very old."
 	icon = 'icons/obj/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_state = "fox_jacket"
+	item_state = "fox_jacket"
+	
+/obj/item/clothing/under/fluff/fox 
+	name = "Aeronautics Jumpsuit"
+	desc = "A jumpsuit tailor made for spacefaring fighter pilots; this one seems very old."
 	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "labcoat_red_open"
+	icon_state = "fox_suit"
+	item_state = "g_suit"
+	_color = "fox_suit"
+	displays_id = 0 //still appears on examine; this is pure fluff.
 
-////// Blue and Bloody Set //deimosvezzati: Hiro Mezu
-
-/obj/item/clothing/under/fluff/customblue // Personal jumpsuit (blue tie / belt buckle)
-	name = "custom-fitted blue jumpsuit"
-	desc = "A custom blue uniform made for a trapped soul. It has the initials H.M. on the tag."
-	icon= 'icons/obj/clothing/uniforms.dmi'
-	icon_state = "hm_suit"
-	_color = "hm_suit"
-	item_state = "hm_suit"
-	has_sensor = 1 // Just to make sure it has a sensor
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Standard Jumpsuit stats
-
-/obj/item/clothing/suit/armor/vest/fluff/bloody //Bloody armor vest
-	name = "bloodied security armor"
-	desc = "A vest drenched in the blood of Greytide. It has seen better days. It has the initials H.M. scratched into the inside."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "hm_armorvest"
-	item_state = "hm_armorvest"
-
-/obj/item/clothing/mask/gas/sechailer/fluff/bluemask //Blue security mask
-	name = "custom SWAT mask"
-	desc = "A neon blue swat mask, used for demoralizing Greytide in the wild. It has the initials H.M. on the side."
-	action_button_name = "HALT!"
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "hm_sec_mask"
-	item_state = "hm_sec_mask"
-	aggressiveness = 3
-	ignore_maskadjust = 1
-
-///// Noble's Clothes Set //theoricus: Baron Robot VII
-
-/obj/item/clothing/under/fluff/noble_clothes // Custom jumpsuit
-	name = "noble clothes"
-	desc = "They fall just short of majestic."
-	icon = 'icons/obj/clothing/uniforms.dmi'
-	icon_state = "noble_clothes"
-	_color = "noble_clothes"
-	item_state = "noble_clothes"
-	has_sensor = 1 // Just to make sure it has a sensor
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Standard Jumpsuit stats
-
-/obj/item/clothing/suit/fluff/noble_coat // A nauseatingly colored coat
-	name = "noble coat"
-	desc = "The livid blues, purples and greens are awesome enough to evoke a visceral response in you; it is not dissimilar to indigestion."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "noble_coat"
-	item_state = "noble_coat"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/shoes/fluff/noble_boot
-	name = "noble boots"
-	desc = "The boots are economically designed to balance function and comfort, so that you can step on peasants without having to worry about blisters. The leather also resists unwanted blood stains."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "noble_boot"
-	_color = "noble_boot"
-	item_state = "noble_boot"
-
-/////Arachno-Man Costume set //the flagbearer: Willow Walker
-/obj/item/clothing/under/fluff/arachno_suit // Custom Jumpsuit
+// TheFlagbearer: Willow Walker
+/obj/item/clothing/under/fluff/arachno_suit
 	name = "Arachno-Man costume"
 	desc = "It's what an evil genius would design if he switched brains with the Amazing Arachno-Man. Actually, he'd probably add weird tentacles that come out the back, too."
 	icon = 'icons/obj/clothing/uniforms.dmi'
@@ -313,34 +236,3 @@
 	body_parts_covered = HEAD
 	flags = BLOCKHAIR
 	flags_inv = HIDEFACE
-
-
-///Aeronuatical Jumpsuit and Jacket //Fox P McCloud: Fox McCloud
-
-//Huge thanks to Nienhaus for these sprites!
-
-/obj/item/clothing/under/fluff/fox
-	name = "Aeronautics Jumpsuit"
-	desc = "A jumpsuit tailor made for spacefaring fighter pilots; this one seems very old."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "fox_suit"
-	item_state = "g_suit"
-	_color = "fox_suit"
-	displays_id = 0 //still appears on examine; this is pure fluff.
-
-/obj/item/clothing/suit/jacket/fluff/fox
-	name = "Aeronautics Jacket"
-	desc = "An aviator styled jacket made from a peculiar material; this one seems very old."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "fox_jacket"
-	item_state = "fox_jacket"
-
-/obj/item/clothing/under/fluff/kharshai // Kharshai: Athena Castile
-	name = "Castile formal outfit"
-	desc = "A white and gold formal uniform, accompanied by a small pin with the numbers '004' etched upon it."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "castile_dress"
-	item_state = "castile_dress"
-	_color = "castile_dress"
-
-//////////// Weapons ////////////
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
index aadaa9a5da3..e7e1e299f27 100644
--- a/code/modules/customitems/item_spawning.dm
+++ b/code/modules/customitems/item_spawning.dm
@@ -1,22 +1,7 @@
 /proc/EquipCustomItems(mob/living/carbon/human/M)
-//	testing("\[CustomItem\] Checking for custom items for [M.ckey] ([M.real_name])...")
 	if(!establish_db_connection())
 		return
 
-	// SCHEMA
-	/**
-	* CustomUserItems
-	*
-	* cuiCKey VARCHAR(36) NOT NULL,
-	* cuiRealName VARCHAR(60) NOT NULL,
-	* cuiPath VARCHAR(255) NOT NULL,
-	* cuiDescription TEXT NOT NULL,
-	* cuiReason TEXT NOT NULL,
-	* cuiPropAdjust TEXT NOT NULL,
-	* cuiJobMask TEXT NOT NULL,
-	* PRIMARY KEY(cuiCkey,cuiRealName,cuiPath)
-	*/
-
 	// Grab the info we want.
 	var/DBQuery/query = dbcon.NewQuery("SELECT cuiPath, cuiPropAdjust, cuiJobMask, cuiDescription, cuiItemName FROM [format_table_name("customuseritems")] WHERE cuiCKey='[M.ckey]' AND (cuiRealName='[M.real_name]' OR cuiRealName='*')")
 	query.Execute()
@@ -25,26 +10,22 @@
 		var/path = text2path(query.item[1])
 		var/propadjust = query.item[2]
 		var/jobmask = query.item[3]
-		testing("\[CustomItem\] Setting up [path] for [M.ckey] ([M.real_name]).  jobmask=[jobmask];propadjust=[propadjust]")
-		var/ok=0
-		if(jobmask!="*")
+		var/ok = 0
+		if(jobmask != "*")
 			var/list/allowed_jobs = text2list(jobmask,",")
 			for(var/i = 1, i <= allowed_jobs.len, i++)
 				if(istext(allowed_jobs[i]))
 					allowed_jobs[i] = trim(allowed_jobs[i])
-			var/alt_blocked=0
+			var/alt_blocked = 0
 			if(M.mind.role_alt_title)
 				if(!(M.mind.role_alt_title in allowed_jobs))
-					alt_blocked=1
+					alt_blocked = 1
 			if(!(M.mind.assigned_role in allowed_jobs) || alt_blocked)
-				testing("Failed to apply custom item for [M.ckey]: Role(s) [M.mind.assigned_role][M.mind.role_alt_title ? " (nor "+M.mind.role_alt_title+")" : ""] are not in allowed_jobs ([english_list(allowed_jobs)])")
 				continue
 
-
 		var/obj/item/Item = new path()
 		var/description = query.item[4]
 		var/newname = query.item[5]
-		testing("Adding new custom item [query.item[1]] to [key_name_admin(M)]...")
 		if(istype(Item,/obj/item/weapon/card/id))
 			var/obj/item/weapon/card/id/I = Item
 			for(var/obj/item/weapon/card/id/C in M)
@@ -56,56 +37,42 @@
 				I.blood_type = C.blood_type
 				I.dna_hash = C.dna_hash
 				I.fingerprint_hash = C.fingerprint_hash
-				//I.pin = C.pin
-				//replace old ID
 				qdel(C)
 				ok = M.equip_if_possible(I, slot_wear_id, 0)	//if 1, last argument deletes on fail
 				break
-			testing("Replaced ID!")
-		else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
-			Item.loc = M.back
-			ok = 1
-			testing("Added to [M.back.name]!")
-			M << "\blue Your [Item.name] has been added to your [M.back.name]."
-		else
+		else if(istype(M.back, /obj/item/weapon/storage)) // Try to place it in something on the mob's back
+			var/obj/item/weapon/storage/S = M.back
+			if(S.contents.len < S.storage_slots)
+				Item.loc = M.back
+				ok = 1
+				M << "<span class='notice'>Your [Item.name] has been added to your [M.back.name].</span>"
+		if(ok == 0)
 			for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
 				if (S.contents.len < S.storage_slots)
 					Item.loc = S
 					ok = 1
-					testing("Added to [S]!")
-					M << "\blue Your [Item.name] has been added to your [S.name]."
+					M << "<span class='notice'>Your [Item.name] has been added to your [S.name].</span>"
 					break
 		if(description)
 			Item.desc = description
 		if(newname)
 			Item.name = newname
 
-		//skip:
 		if (ok == 0) // Finally, since everything else failed, place it on the ground
-			testing("Plopped onto the ground!")
 			Item.loc = get_turf(M.loc)
 
 		HackProperties(Item,propadjust)
 
-
 // This is hacky, but since it's difficult as fuck to make a proper parser in BYOND without killing the server, here it is. - N3X
 /proc/HackProperties(var/mob/living/carbon/human/M,var/obj/item/I,var/script)
-	/*
-	A=string:b lol {REALNAME} {ROLE} {ROLE_ALT};
-	B=icon:icons/dmi/lol.dmi:STATE;
-	B=number:29;
-	*/
-	var/list/statements=text2list(script,";")
-	if(statements.len==0)
-		return // Don't even bother.
+	var/list/statements = text2list(script,";")
+	if(statements.len == 0)
+		return 
 	for(var/statement in statements)
 		var/list/assignmentChunks = text2list(statement,"=")
 		var/varname = assignmentChunks[1]
-		//var/operator = "="
-
 		var/list/typeChunks=text2list(script,":")
 		var/desiredType=typeChunks[1]
-		//var/value
 		switch(desiredType)
 			if("string")
 				var/output = typeChunks[2]
@@ -120,80 +87,3 @@
 					I.vars[varname]=new /icon(typeChunks[2])
 				if(typeChunks.len==3)
 					I.vars[varname]=new /icon(typeChunks[2],typeChunks[3])
-
-
-
-//switch this out to use a database at some point
-//list of ckey/ real_name and item paths
-//gives item to specific people when they join if it can
-//for multiple items just add mutliple entries, unless i change it to be a listlistlist
-//yes, it has to be an item, you can't pick up nonitems
-/* Old as fuck, not SQL-based, hardcoded keys.
-/proc/EquipCustomItems(mob/living/carbon/human/M)
-	// load lines
-	var/file = file2text("config/custom_items.txt")
-	var/lines = text2list(file, "\n")
-
-	for(var/line in lines)
-		// split & clean up
-		var/list/Entry = text2list(line, ":")
-		for(var/i = 1 to Entry.len)
-			Entry[i] = trim(Entry[i])
-
-		if(Entry.len < 3)
-			continue;
-
-		if(Entry[1] == M.ckey && Entry[2] == M.real_name)
-			var/list/Paths = text2list(Entry[3], ",")
-			for(var/P in Paths)
-				var/ok = 0  // 1 if the item was placed successfully
-				P = trim(P)
-				var/path = text2path(P)
-				var/obj/item/Item = new path()
-				if(istype(Item,/obj/item/weapon/card/id))
-					//id card needs to replace the original ID
-					if(M.ckey == "nerezza" && M.real_name == "Asher Spock" && M.mind.role_alt_title && M.mind.role_alt_title != "Emergency Physician")
-						//only spawn ID if asher is joining as an emergency physician
-						ok = 1
-						del(Item)
-						goto skip
-					var/obj/item/weapon/card/id/I = Item
-					for(var/obj/item/weapon/card/id/C in M)
-						//default settings
-						I.name = "[M.real_name]'s ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
-						I.registered_name = M.real_name
-						I.access = C.access
-						I.assignment = C.assignment
-						I.blood_type = C.blood_type
-						I.dna_hash = C.dna_hash
-						I.fingerprint_hash = C.fingerprint_hash
-						//I.pin = C.pin
-
-						//custom stuff
-						if(M.ckey == "fastler" && M.real_name == "Fastler Greay") //This is a Lifetime ID
-							I.name = "[M.real_name]'s Lifetime ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
-						else if(M.ckey == "nerezza" && M.real_name == "Asher Spock") //This is an Odysseus Specialist ID
-							I.name = "[M.real_name]'s Odysseus Specialist ID Card ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
-							I.access += list(access_robotics) //Station-based mecha pilots need this to access the recharge bay.
-						else if(M.ckey == "roaper" && M.real_name == "Ian Colm") //This is a Technician ID
-							I.name = "[M.real_name]'s Technician ID ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
-
-						//replace old ID
-						del(C)
-						ok = M.equip_if_possible(I, slot_wear_id, 0)	//if 1, last argument deletes on fail
-						break
-				else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
-					Item.loc = M.back
-					ok = 1
-
-				else
-					for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
-						if (S.contents.len < S.storage_slots)
-							Item.loc = S
-							ok = 1
-							break
-
-				skip:
-				if (ok == 0) // Finally, since everything else failed, place it on the ground
-					Item.loc = get_turf(M.loc)
-*/
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index b32dcd649b6..4c99dd12895 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -676,8 +676,6 @@ var/global/list/damage_icon_parts = list()
 		if(!t_state)
 			t_state = s_store.icon_state
 		var/dmi='icons/mob/belt_mirror.dmi'
-		if(s_store.custom)
-			dmi  = s_store.icon
 		overlays_standing[SUIT_STORE_LAYER]  = image("icon" = dmi, "icon_state" = "[t_state]")
 		s_store.screen_loc = ui_sstore1		//TODO
 	else
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 8c837864706..142f350131e 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -760,7 +760,7 @@ datum/preferences
 					clothes_s = new /icon(uniform_dmi, "officer_s")
 					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
 					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
-					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "deus_blueshield"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
 					switch(backbag)
 						if(2)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 968a5a64683..371c7cdd9f5 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -54,14 +54,12 @@
 /obj/item/weapon/pen/fancy
 	name = "fancy pen"
 	desc = "A fancy metal pen. It uses blue ink. An inscription on one side reads,\"L.L. - L.R.\""
-	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "fancypen"
 
 /obj/item/weapon/pen/gold
 	name = "Gilded Pen"
 	desc = "A golden pen that is gilded with a meager amount of gold material. The word 'Nanotrasen' is etched on the clip of the pen."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "eugene_pen"
+	icon_state = "goldpen"
 
 /obj/item/weapon/pen/attack(mob/living/M, mob/user)
 	if(!istype(M))
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index de589789b2f..4e4eee07c0e 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -388,14 +388,12 @@
 /obj/item/weapon/reagent_containers/food/drinks/flask/thermos
 	name = "vintage thermos"
 	desc = "An older thermos with a faint shine."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "johann_erzatz_1"
+	icon_state = "thermos"
 	volume = 50
 
 /obj/item/weapon/reagent_containers/food/drinks/flask/shiny
 	name = "shiny flask"
 	desc = "A shiny metal flask. It appears to have a Greek symbol inscribed on it."
-	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "shinyflask"
 	volume = 50
 
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 62dbf71b738..f15ba1ffd89 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index c90e1077689..1e34467073f 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 ccb52f3bfcf..750cdae305c 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 954ae322828..00588161a65 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 80c80037e46..85a93a6feb4 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 96236e3c513..9bd0199de51 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 3a78800241d..0a9a2409bb8 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 8e96df873c4..58f28e25951 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 9704779d9b8..06603c468ee 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 79b38b1ebed..743ea172634 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 50968e0275d..826c5ea1f4f 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/paintkit.dmi b/icons/obj/paintkit.dmi
new file mode 100644
index 00000000000..72bc719e812
Binary files /dev/null and b/icons/obj/paintkit.dmi differ
diff --git a/icons/obj/paper.dmi b/icons/obj/paper.dmi
index beebb1d2c15..ff01910db33 100644
Binary files a/icons/obj/paper.dmi and b/icons/obj/paper.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 06fe4867395..25e7415d698 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1088,7 +1088,6 @@
 #include "code\modules\crafting\table.dm"
 #include "code\modules\customitems\item_defines.dm"
 #include "code\modules\customitems\item_spawning.dm"
-#include "code\modules\customitems\definitions\base.dm"
 #include "code\modules\DetectiveWork\detective_work.dm"
 #include "code\modules\DetectiveWork\evidence.dm"
 #include "code\modules\DetectiveWork\footprints_and_rag.dm"