Personal Crafting & Dependencies

code/game/objects/items/devices/multitool.dm

@@ -29,6 +29,7 @@
 	var/obj/machinery/connectable	//Used to connect machinery.
 	var/weakref_wiring //Used to store weak references for integrated circuitry. This is now the Omnitool.
 	toolspeed = 1
+	tool_qualities = list(TOOL_MULTITOOL)
 
 /obj/item/device/multitool/attack_self(mob/living/user)
 	var/choice = alert("What do you want to do with \the [src]?","Multitool Menu", "Switch Mode", "Clear Buffers", "Cancel")
@@ -65,9 +66,6 @@
 
 	return
 
-/obj/item/device/multitool/is_multitool()
-	return TRUE
-
 /obj/item/device/multitool/cyborg
 	name = "multitool"
 	desc = "Optimised and stripped-down version of a regular multitool."

code/game/objects/items/weapons/handcuffs.dm

@@ -176,17 +176,6 @@ var/last_chew = 0
 /obj/item/weapon/handcuffs/cable/white
 	color = "#FFFFFF"
 
-/obj/item/weapon/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob)
-	..()
-	if(istype(I, /obj/item/stack/rods))
-		var/obj/item/stack/rods/R = I
-		if (R.use(1))
-			var/obj/item/weapon/material/wirerod/W = new(get_turf(user))
-			user.put_in_hands(W)
-			to_chat(user, "<span class='notice'>You wrap the cable restraint around the top of the rod.</span>")
-			qdel(src)
-			update_icon(user)
-
 /obj/item/weapon/handcuffs/cyborg
 	dispenser = 1
 

code/game/objects/items/weapons/improvised_components.dm

@@ -38,33 +38,3 @@
 		qdel(W)
 		qdel(src)
 		return
-
-/obj/item/weapon/material/wirerod
-	name = "wired rod"
-	desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
-	icon_state = "wiredrod"
-	item_state = "rods"
-	force = 8
-	throwforce = 10
-	w_class = ITEMSIZE_NORMAL
-	attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
-	force_divisor = 0.1
-	thrown_force_divisor = 0.1
-
-/obj/item/weapon/material/wirerod/attackby(var/obj/item/I, mob/user as mob)
-	..()
-	var/obj/item/finished
-	if(istype(I, /obj/item/weapon/material/shard) || istype(I, /obj/item/weapon/material/butterflyblade))
-		var/obj/item/weapon/material/tmp_shard = I
-		finished = new /obj/item/weapon/material/twohanded/spear(get_turf(user), tmp_shard.material.name)
-		to_chat(user, "<span class='notice'>You fasten \the [I] to the top of the rod with the cable.</span>")
-	else if(I.is_wirecutter())
-		finished = new /obj/item/weapon/melee/baton/cattleprod(get_turf(user))
-		to_chat(user, "<span class='notice'>You fasten the wirecutters to the top of the rod with the cable, prongs outward.</span>")
-	if(finished)
-		user.drop_from_inventory(src)
-		user.drop_from_inventory(I)
-		qdel(I)
-		qdel(src)
-		user.put_in_hands(finished)
-	update_icon(user)

code/game/objects/items/weapons/tools/crowbar.dm

@@ -20,9 +20,7 @@
 	drop_sound = 'sound/items/drop/crowbar.ogg'
 	pickup_sound = 'sound/items/pickup/crowbar.ogg'
 	toolspeed = 1
-
-/obj/item/weapon/tool/crowbar/is_crowbar()
-	return TRUE
+	tool_qualities = list(TOOL_CROWBAR)
 
 /obj/item/weapon/tool/crowbar/red
 	icon = 'icons/obj/tools.dmi'

code/game/objects/items/weapons/tools/screwdriver.dm

@@ -21,6 +21,7 @@
 	attack_verb = list("stabbed")
 	sharp  = 1
 	toolspeed = 1
+	tool_qualities = list(TOOL_SCREWDRIVER)
 	var/random_color = TRUE
 
 /obj/item/weapon/tool/screwdriver/suicide_act(mob/user)
@@ -67,10 +68,6 @@
 		M = user
 	return eyestab(M,user)
 
-/obj/item/weapon/tool/screwdriver/is_screwdriver()
-	return TRUE
-
-
 /datum/category_item/catalogue/anomalous/precursor_a/alien_screwdriver
 	name = "Precursor Alpha Object - Hard Light Torgue Tool"
 	desc = "This appears to be a tool, with a solid handle, and a thin hard light \

code/game/objects/items/weapons/tools/wirecutters.dm

@@ -22,6 +22,7 @@
 	sharp = 1
 	edge = 1
 	toolspeed = 1
+	tool_qualities = list(TOOL_WIRECUTTER)
 	var/random_color = TRUE
 
 /obj/item/weapon/tool/wirecutters/New()
@@ -43,10 +44,6 @@
 	else
 		..()
 
-/obj/item/weapon/tool/wirecutters/is_wirecutter()
-	return TRUE
-
-
 /datum/category_item/catalogue/anomalous/precursor_a/alien_wirecutters
 	name = "Precursor Alpha Object - Wire Seperator"
 	desc = "An object appearing to have a tool shape. It has two handles, and two \

code/game/objects/items/weapons/tools/wrench.dm

@@ -17,9 +17,7 @@
 	toolspeed = 1
 	drop_sound = 'sound/items/drop/wrench.ogg'
 	pickup_sound = 'sound/items/pickup/wrench.ogg'
-
-/obj/item/weapon/tool/wrench/is_wrench()
-	return TRUE
+	tool_qualities = list(TOOL_WRENCH)
 
 /obj/item/weapon/tool/wrench/cyborg
 	name = "automatic wrench"