Removed custom item defines, refactored mech kits.

code/game/mecha/equipment/tools/tools.dm

@@ -1070,18 +1070,6 @@
 			do_after_cooldown()
 		return 1
 
-/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"
-
-	var/new_name = "mech"    //What is the variant called?
-	var/new_desc = "A mech." //How is the new mech described?
-	var/new_icon = "ripley"  //What base icon will the new mech use?
-	var/removable = null     //Can the kit be removed?
-	var/list/allowed_types = list() //Types of mech that the kit will work on.
-
 /obj/item/mecha_parts/mecha_equipment/tool/passenger
 	name = "passenger compartment"
 	desc = "A mountable passenger compartment for exo-suits. Rather cramped."

code/game/mecha/mecha.dm

@@ -814,13 +814,13 @@
 		user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]")
 		return
 
-	else if(istype(W, /obj/item/weapon/paintkit))
+	else if(istype(W, /obj/item/device/kit/paint))
 
 		if(occupant)
 			user << "You can't customize a mech while someone is piloting it - that would be unsafe!"
 			return
 
-		var/obj/item/weapon/paintkit/P = W
+		var/obj/item/device/kit/paint/P = W
 		var/found = null
 
 		for(var/type in P.allowed_types)
@@ -838,9 +838,7 @@
 		src.desc = P.new_desc
 		src.initial_icon = P.new_icon
 		src.reset_icon()
-
-		user.drop_item()
-		qdel(P)
+		P.use(1, user)
 
 	else
 		call((proc_res["dynattackby"]||src), "dynattackby")(W,user)