diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 9877872df73..fd0cd8b68b6 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -10,6 +10,9 @@
 ////////// Usable Items //////////
 //////////////////////////////////
 
+/obj/item/device/fluff
+	var/used = 0
+
 /obj/item/device/fluff/tattoo_gun // Generic tattoo gun, make subtypes for different folks
 	name = "dispoable tattoo pen"
 	desc = "A cheap plastic tattoo application pen."
@@ -18,7 +21,6 @@
 	force = 0
 	throwforce = 0
 	w_class = 1
-	var/used = 0
 	var/tattoo_name = "tiger stripe tattoo" // Tat name for visible messages
 	var/tattoo_icon = "Tiger Body" // body_accessory.dmi, new icons defined in sprite_accessories.dm
 	var/tattoo_r = 1 // RGB values for the body markings
@@ -84,8 +86,28 @@
 	..()
 	update_icon()
 
+/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat
+	desc = "A cheap plastic tattoo application pen.<br>This one seems heavily used."
+	tattoo_name = "circuitry tattoo"
+	tattoo_icon = "Elliot Circuit Tattoo"
+	tattoo_r = 48
+	tattoo_g = 138
+	tattoo_b = 176
 
+/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat/attack_self(mob/user as mob)
+	if(!used)
+		var/ink_color = input("Please select an ink color.", "Tattoo Ink Color", rgb(tattoo_r, tattoo_g, tattoo_b)) as color|null
+		if(ink_color && !(user.incapacitated() || used) )
+			tattoo_r = hex2num(copytext(ink_color, 2, 4))
+			tattoo_g = hex2num(copytext(ink_color, 4, 6))
+			tattoo_b = hex2num(copytext(ink_color, 6, 8))
 
+			to_chat(user, "<span class='notice'>You change the color setting on the [src].</span>")
+
+			update_icon()
+
+	else
+		to_chat(user, "<span class='notice'>The [src] is out of ink!</span>")
 
 /obj/item/weapon/claymore/fluff // MrBarrelrolll: Maximus Greenwood
 	name = "Greenwood's Blade"
@@ -197,6 +219,58 @@
 		to_chat(target, "<span class='notice'>You comb your tail with the [src].</span>")
 		used = 1
 
+#define USED_MOD_HELM 1
+#define USED_MOD_SUIT 2
+
+/obj/item/device/fluff/shadey_plasman_modkit
+	name = "plasmaman suit modkit"
+	desc = "A kit containing nanites that are able to modify the look of a plasmaman suit and helmet without exposing the wearer to hostile environments."
+	icon_state = "modkit"
+	w_class = 2
+	force = 0
+	throwforce = 0
+
+/obj/item/device/fluff/shadey_plasman_modkit/afterattack(atom/target, mob/user, proximity)
+	if(!proximity || !ishuman(user) || user.lying)
+		return
+	var/mob/living/carbon/human/H = user
+
+	if(istype(target, /obj/item/clothing/head/helmet/space/eva/plasmaman))
+		if(used & USED_MOD_HELM)
+			to_chat(H, "<span class='notice'>The kit's helmet modifier has already been used.</span>")
+			return
+		to_chat(H, "<span class='notice'>You modify the appearance of [target].</span>")
+		used |= USED_MOD_HELM
+
+		var/obj/item/clothing/head/helmet/space/eva/plasmaman/P = target
+		P.name = "plasma containment helmet"
+		P.desc = "A purpose-built containment helmet designed to keep plasma in, and everything else out."
+		P.icon_state = "plasmaman_halo_helmet[P.on]"
+		P.base_state = "plasmaman_halo_helmet"
+
+		if(P == H.head)
+			H.update_inv_head()
+		return
+	if(istype(target, /obj/item/clothing/suit/space/eva/plasmaman))
+		if(used & USED_MOD_SUIT)
+			to_chat(user, "<span class='notice'>The kit's suit modifier has already been used.</span>")
+			return
+		to_chat(H, "<span class='notice'>You modify the appearance of [target].</span>")
+		used |= USED_MOD_SUIT
+
+		var/obj/item/clothing/suit/space/eva/plasmaman/P = target
+		P.name = "plasma containment suit"
+		P.desc = "A feminine containment suit designed to keep plasma in, and everything else out. It's even got an overskirt."
+		P.icon_state = "plasmaman_halo"
+
+		if(P == H.wear_suit)
+			H.update_inv_wear_suit()
+		return
+	to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
+
+#undef USED_MOD_HELM
+#undef USED_MOD_SUIT
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////
@@ -493,26 +567,3 @@
 	suit_adjusted = 1
 	species_fit = null
 	sprite_sheets = null
-
-/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat
-	desc = "A cheap plastic tattoo application pen.<br>This one seems heavily used."
-	tattoo_name = "circuitry tattoo"
-	tattoo_icon = "Elliot Circuit Tattoo"
-	tattoo_r = 48
-	tattoo_g = 138
-	tattoo_b = 176
-
-/obj/item/device/fluff/tattoo_gun/elliot_cybernetic_tat/attack_self(mob/user as mob)
-	if(!used)
-		var/ink_color = input("Please select an ink color.", "Tattoo Ink Color", rgb(tattoo_r, tattoo_g, tattoo_b)) as color|null
-		if(ink_color && !(user.incapacitated() || used) )
-			tattoo_r = hex2num(copytext(ink_color, 2, 4))
-			tattoo_g = hex2num(copytext(ink_color, 4, 6))
-			tattoo_b = hex2num(copytext(ink_color, 6, 8))
-
-			to_chat(user, "<span class='notice'>You change the color setting on the [src].</span>")
-
-			update_icon()
-
-	else
-		to_chat(user, "<span class='notice'>The [src] is out of ink!</span>")
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 5bdf365b547..d8201ba9e3d 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 00e0112c53f..d2b49ff4797 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 1eb8c732641..21205081639 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 6b3a721a732..c294285ed11 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ