Revert "What was supposed to be another straightforward major system overhaul that once again spiraled out of control (#8220)"

This reverts commit 4d8c43f106.

code/game/objects/structures/crates_lockers/__closets.dm

@@ -277,13 +277,13 @@
 	return
 
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.get_tool_quality(TOOL_WRENCH))
+	if(W.is_wrench())
 		if(opened)
 			if(anchored)
 				user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
 			else
 				user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
-			if(do_after(user, 20 * W.get_tool_speed(TOOL_WRENCH)))
+			if(do_after(user, 20 * W.toolspeed))
 				if(!src) return
 				to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
 				anchored = !anchored
@@ -332,7 +332,7 @@
 	else if(seal_tool)
 		if(istype(W, seal_tool))
 			var/obj/item/weapon/S = W
-			if(S.get_tool_quality(TOOL_WELDER))
+			if(istype(S, /obj/item/weapon/weldingtool))
 				var/obj/item/weapon/weldingtool/WT = S
 				if(!WT.remove_fuel(0,user))
 					if(!WT.isOn())
@@ -340,7 +340,7 @@
 					else
 						to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
 						return
-			if(do_after(user, 20 * S.get_tool_speed(TOOL_WELDER)))
+			if(do_after(user, 20 * S.toolspeed))
 				playsound(src, S.usesound, 50)
 				sealed = !sealed
 				update_icon()

code/game/objects/structures/crates_lockers/closets/coffin.dm

@@ -70,11 +70,11 @@
 
 /obj/structure/closet/grave/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(src.opened)
-		if(W.get_tool_quality(TOOL_SHOVEL))
+		if(istype(W, /obj/item/weapon/shovel))
 			user.visible_message("<span class='notice'>[user] piles dirt into \the [src.name].</span>", \
 								 "<span class='notice'>You start to pile dirt into \the [src.name].</span>", \
 								 "<span class='notice'>You hear dirt being moved.</span>")
-			if(do_after(user, 40 * W.get_tool_speed(TOOL_SHOVEL)))
+			if(do_after(user, 40 * W.toolspeed))
 				user.visible_message("<span class='notice'>[user] pats down the dirt on top of \the [src.name].</span>", \
 								 "<span class='notice'>You finish filling in \the [src.name].</span>")
 				close()
@@ -106,12 +106,12 @@
 		if(W)
 			W.forceMove(src.loc)
 	else
-		if(W.get_tool_quality(TOOL_SHOVEL))
+		if(istype(W, /obj/item/weapon/shovel))
 			if(user.a_intent == I_HURT)	// Hurt intent means you're trying to kill someone, or just get rid of the grave
 				user.visible_message("<span class='notice'>[user] begins to smoothe out the dirt of \the [src.name].</span>", \
 									 "<span class='notice'>You start to smoothe out the dirt of \the [src.name].</span>", \
 									 "<span class='notice'>You hear dirt being moved.</span>")
-				if(do_after(user, 40 * W.get_tool_speed(TOOL_SHOVEL)))
+				if(do_after(user, 40 * W.toolspeed))
 					user.visible_message("<span class='notice'>[user] finishes smoothing out \the [src.name].</span>", \
 										 "<span class='notice'>You finish smoothing out \the [src.name].</span>")
 					if(LAZYLEN(contents))
@@ -127,7 +127,7 @@
 				user.visible_message("<span class='notice'>[user] begins to unearth \the [src.name].</span>", \
 									 "<span class='notice'>You start to unearth \the [src.name].</span>", \
 									 "<span class='notice'>You hear dirt being moved.</span>")
-				if(do_after(user, 40 * W.get_tool_speed(TOOL_SHOVEL)))
+				if(do_after(user, 40 * W.toolspeed))
 					user.visible_message("<span class='notice'>[user] reaches the bottom of \the [src.name].</span>", \
 										 "<span class='notice'>You finish digging out \the [src.name].</span>")
 					break_open()

code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm

@@ -54,13 +54,13 @@
 		to_chat(user, "<span class='notice'>Access Denied</span>")
 
 /obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.get_tool_quality(TOOL_WRENCH))
+	if(W.is_wrench())
 		if(opened)
 			if(anchored)
 				user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
 			else
 				user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
-			if(do_after(user, 20 * W.get_tool_speed(TOOL_WRENCH)))
+			if(do_after(user, 20 * W.toolspeed))
 				if(!src) return
 				to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
 				anchored = !anchored

code/game/objects/structures/crates_lockers/crates.dm

@@ -115,7 +115,7 @@
 			user.drop_item()
 			W.forceMove(src)
 			return
-	else if(W.get_tool_quality(TOOL_WIRECUTTER))
+	else if(W.is_wirecutter())
 		if(rigged)
 			to_chat(user , "<span class='notice'>You cut away the wiring.</span>")
 			playsound(src, W.usesound, 100, 1)

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -25,7 +25,7 @@
 	var/turf/T = get_turf(src)
 	if(!T)
 		to_chat(user, "<span class='notice'>You can't open this here!</span>")
-	if(W.get_tool_quality(TOOL_CROWBAR))
+	if(W.is_crowbar())
 		new /obj/item/stack/material/wood(src)
 
 		for(var/atom/movable/AM in contents)
@@ -48,7 +48,7 @@
 	icon_state = "vehiclecrate"
 
 /obj/structure/largecrate/hoverpod/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.get_tool_quality(TOOL_CROWBAR))
+	if(W.is_crowbar())
 		var/obj/item/mecha_parts/mecha_equipment/ME
 		var/obj/mecha/working/hoverpod/H = new (loc)
 

code/game/objects/structures/crates_lockers/vehiclecage.dm

@@ -31,11 +31,11 @@
 	var/turf/T = get_turf(src)
 	if(!T)
 		to_chat(user, "<span class='notice'>You can't open this here!</span>")
-	if(W.get_tool_quality(TOOL_WRENCH) && do_after(user, 60 * W.get_tool_speed(TOOL_WRENCH), src))
+	if(W.is_wrench() && do_after(user, 60 * W.toolspeed, src))
 		playsound(src, W.usesound, 50, 1)
 		disassemble(W, user)
 		user.visible_message("<span class='notice'>[user] begins loosening \the [src]'s bolts.</span>")
-	if(W.get_tool_quality(TOOL_WIRECUTTER) && do_after(user, 70 * W.get_tool_speed(TOOL_WIRECUTTER), src))
+	if(W.is_wirecutter() && do_after(user, 70 * W.toolspeed, src))
 		playsound(src, W.usesound, 50, 1)
 		disassemble(W, user)
 		user.visible_message("<span class='notice'>[user] begins cutting \the [src]'s bolts.</span>")