TS-Rogue-Star · Arokha · Sep 19, 2023 · Sep 20, 2023 · Sep 25, 2023 · Sep 26, 2023
diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm
@@ -92,7 +92,7 @@
 	return 1
 
 /obj/machinery/atmospherics/binary/circulator/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.is_wrench())
+	if(W.has_tool_quality(TOOL_WRENCH))
 		playsound(src, W.usesound, 75, 1)
 		anchored = !anchored
 		user.visible_message("[user.name] [anchored ? "secures" : "unsecures"] the bolts holding [src.name] to the floor.", \

diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
@@ -279,7 +279,7 @@
 	add_fingerprint(usr)
 
 /obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if (unlocked)
 		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")

diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm
@@ -82,7 +82,7 @@
 		add_overlay(image('icons/obj/pipeturbine.dmi', "hi-turb"))
 
 /obj/machinery/atmospherics/pipeturbine/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.is_wrench())
+	if(W.has_tool_quality(TOOL_WRENCH))
 		anchored = !anchored
 		playsound(src, W.usesound, 50, 1)
 		to_chat(user, "<span class='notice'>You [anchored ? "secure" : "unsecure"] the bolts holding \the [src] to the floor.</span>")
@@ -256,7 +256,7 @@
 	add_avail(power_generated)
 
 /obj/machinery/power/turbinemotor/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.is_wrench())
+	if(W.has_tool_quality(TOOL_WRENCH))
 		anchored = !anchored
 		playsound(src, W.usesound, 50, 1)
 		turbine = null

diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -239,7 +239,7 @@ Thus, the two variables affect pump operation are set in New():
 		update_icon()
 
 /obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if (!(stat & NOPOWER) && use_power)
 		to_chat(user, "<span class='warning'>You cannot unwrench this [src], turn it off first.</span>")

diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
@@ -80,7 +80,7 @@
 		update_icon()
 
 /obj/machinery/atmospherics/omni/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if(!W.is_wrench())
+	if(!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 
 	if(!can_unwrench())

diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm
@@ -147,7 +147,7 @@
 
 
 /obj/machinery/atmospherics/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if (connected_device)
 		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], dettach \the [connected_device] first.</span>")

diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
@@ -52,7 +52,7 @@
 		update_icon()
 
 /obj/machinery/atmospherics/trinary/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if(!can_unwrench())
 		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")

diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm
@@ -327,7 +327,7 @@
 				go_to_side()
 
 /obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if(!can_unwrench())
 		to_chat(user, "<span class='warnng'>You cannot unwrench \the [src], it too exerted due to internal pressure.</span>")

diff --git a/code/ATMOSPHERICS/components/unary/heat_exchanger.dm b/code/ATMOSPHERICS/components/unary/heat_exchanger.dm
@@ -67,7 +67,7 @@
 	return 1
 
 /obj/machinery/atmospherics/unary/heat_exchanger/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	var/turf/T = src.loc
 	if (level==1 && isturf(T) && !T.is_plating())

diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -164,7 +164,7 @@
 	update_icon()
 
 /obj/machinery/atmospherics/unary/outlet_injector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 
 	playsound(src, W.usesound, 50, 1)

diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -390,8 +390,8 @@
 	return
 
 /obj/machinery/atmospherics/unary/vent_pump/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
+	if(W.has_tool_quality(TOOL_WELDER))
+		var/obj/item/weapon/weldingtool/WT = W.get_welder()
 		if (WT.remove_fuel(0,user))
 			to_chat(user, "<span class='notice'>Now welding the vent.</span>")
 			if(do_after(user, 20 * WT.toolspeed))
@@ -429,7 +429,7 @@
 		update_icon()
 
 /obj/machinery/atmospherics/unary/vent_pump/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if (!(stat & NOPOWER) && use_power)
 		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")

diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -270,7 +270,7 @@
 		update_icon()
 
 /obj/machinery/atmospherics/unary/vent_scrubber/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if (!(stat & NOPOWER) && use_power)
 		to_chat(user, "<span class='warning'>You cannot unwrench \the [src], turn it off first.</span>")

diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm
@@ -288,7 +288,7 @@
 				open()
 
 /obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	if (istype(src, /obj/machinery/atmospherics/valve/digital) && !src.allowed(user))
 		to_chat(user, "<span class='warning'>Access denied.</span>")

diff --git a/code/ATMOSPHERICS/pipes/pipe_base.dm b/code/ATMOSPHERICS/pipes/pipe_base.dm
@@ -116,7 +116,7 @@
 	if(istype(W,/obj/item/device/pipe_painter))
 		return 0
 
-	if (!W.is_wrench())
+	if (!W.has_tool_quality(TOOL_WRENCH))
 		return ..()
 	var/turf/T = src.loc
 	if (level==1 && isturf(T) && !T.is_plating())

diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
@@ -278,6 +278,7 @@ var/global/list/##LIST_NAME = list();\
 #define IS_CROWBAR			"crowbar"
 #define IS_WIRECUTTER		"wirecutter"
 #define IS_WRENCH			"wrench"
+#define IS_WELDER			"welder"
 
 
 // Diagonal movement

diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
@@ -1044,7 +1044,7 @@ var/global/list/common_tools = list(
 
 
 /proc/is_wire_tool(obj/item/I)
-	if(istype(I, /obj/item/device/multitool) || I.is_wirecutter())
+	if(istype(I, /obj/item/device/multitool) || I.has_tool_quality(TOOL_WIRECUTTER))
 		return TRUE
 	if(istype(I, /obj/item/device/assembly/signaler))
 		return TRUE
@@ -1058,6 +1058,12 @@ var/global/list/common_tools = list(
 				return 3800
 			else
 				return 0
+		if(/obj/item/weapon/tool/transforming)
+			var/obj/item/weapon/tool/transforming/TT = W
+			if(TT.possible_tooltypes[TT.current_tooltype] == TOOL_WELDER)
+				return 3800
+			else
+				return 0
 		if(/obj/item/weapon/flame/lighter)
 			if(W:lit)
 				return 1500
@@ -1105,7 +1111,7 @@ var/global/list/common_tools = list(
 	if(W.sharp)
 		return TRUE
 	return ( \
-		W.is_screwdriver()		     				              || \
+		W.has_tool_quality(TOOL_SCREWDRIVER)		     				              || \
 		istype(W, /obj/item/weapon/pen)                           || \
 		istype(W, /obj/item/weapon/weldingtool)					  || \
 		istype(W, /obj/item/weapon/flame/lighter/zippo)			  || \

diff --git a/code/datums/components/crafting/tool_quality.dm b/code/datums/components/crafting/tool_quality.dm
@@ -27,3 +27,7 @@
 /// DEPRECATED PROC: DO NOT USE IN NEW CODE
 /obj/item/proc/is_multitool()
 	return has_tool_quality(TOOL_MULTITOOL)
+
+/// DEPRECATED PROC: DO NOT USE IN NEW CODE
+/obj/item/proc/is_welder()
+	return has_tool_quality(TOOL_WELDER)
diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm
@@ -41,16 +41,19 @@
 	var/list/L = steps[steps.len]
 	switch(L["key"])
 		if(IS_SCREWDRIVER)
-			if(I.is_screwdriver())
+			if(I.has_tool_quality(TOOL_SCREWDRIVER))
 				return steps.len
 		if(IS_CROWBAR)
-			if(I.is_crowbar())
+			if(I.has_tool_quality(TOOL_CROWBAR))
 				return steps.len
 		if(IS_WIRECUTTER)
-			if(I.is_wirecutter())
+			if(I.has_tool_quality(TOOL_WIRECUTTER))
 				return steps.len
 		if(IS_WRENCH)
-			if(I.is_wrench())
+			if(I.has_tool_quality(TOOL_WRENCH))
+				return steps.len
+		if(IS_WELDER)
+			if(I.has_tool_quality(IS_WELDER))
 				return steps.len
 
 	if(istype(I, L["key"]))
@@ -108,30 +111,36 @@
 
 	switch(L["key"])
 		if(IS_SCREWDRIVER)
-			if(I.is_screwdriver())
+			if(I.has_tool_quality(TOOL_SCREWDRIVER))
 				return FORWARD
 		if(IS_CROWBAR)
-			if(I.is_crowbar())
+			if(I.has_tool_quality(TOOL_CROWBAR))
 				return FORWARD
 		if(IS_WIRECUTTER)
-			if(I.is_wirecutter())
+			if(I.has_tool_quality(TOOL_WIRECUTTER))
 				return FORWARD
 		if(IS_WRENCH)
-			if(I.is_wrench())
+			if(I.has_tool_quality(TOOL_WRENCH))
+				return FORWARD
+		if(IS_WELDER)
+			if(I.has_tool_quality(IS_WELDER))
 				return FORWARD
 
 	switch(L["backkey"])
 		if(IS_SCREWDRIVER)
-			if(I.is_screwdriver())
+			if(I.has_tool_quality(TOOL_SCREWDRIVER))
 				return BACKWARD
 		if(IS_CROWBAR)
-			if(I.is_crowbar())
+			if(I.has_tool_quality(TOOL_CROWBAR))
 				return BACKWARD
 		if(IS_WIRECUTTER)
-			if(I.is_wirecutter())
+			if(I.has_tool_quality(TOOL_WIRECUTTER))
 				return BACKWARD
 		if(IS_WRENCH)
-			if(I.is_wrench())
+			if(I.has_tool_quality(TOOL_WRENCH))
+				return BACKWARD
+		if(IS_WELDER)
+			if(I.has_tool_quality(IS_WELDER))
 				return BACKWARD
 
 	if(istype(I, L["key"]))

diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
@@ -168,8 +168,8 @@
 	switch(action)
 		 // Toggles the cut/mend status.
 		if("cut")
-			// if(!I.is_wirecutter() && !user.can_admin_interact())
-			if(!istype(I) || !I.is_wirecutter())
+			// if(!I.has_tool_quality(TOOL_WIRECUTTER) && !user.can_admin_interact())
+			if(!istype(I) || !I.has_tool_quality(TOOL_WIRECUTTER))
 				to_chat(user, "<span class='error'>You need wirecutters!</span>")
 				return
 
@@ -179,8 +179,8 @@
 
 		// Pulse a wire.
 		if("pulse")
-			// if(!I.is_multitool() && !user.can_admin_interact())
-			if(!istype(I) || !I.is_multitool())
+			// if(!I.has_tool_quality(TOOL_MULTITOOL) && !user.can_admin_interact())
+			if(!istype(I) || !I.has_tool_quality(TOOL_MULTITOOL))
 				to_chat(user, "<span class='error'>You need a multitool!</span>")
 				return
 

diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm
@@ -34,7 +34,7 @@
 			to_chat(user, "You load [result] lengths of cable into [src].")
 		return
 
-	if(O.is_wirecutter())
+	if(O.has_tool_quality(TOOL_WIRECUTTER))
 		if(cable && cable.get_amount())
 			var/m = round(input(usr, "Please specify the length of cable to cut", "Cut cable", min(cable.get_amount(), 30)) as num, 1)
 			m = min(m, cable.get_amount())

diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm
@@ -30,13 +30,13 @@
 		. += "There is a small display that reads \"[convert_k2c(target_temp)]C\"."
 
 /obj/machinery/power/thermoregulator/attackby(obj/item/I, mob/user)
-	if(I.is_screwdriver())
+	if(I.has_tool_quality(TOOL_SCREWDRIVER))
 		if(default_deconstruction_screwdriver(user,I))
 			return
-	if(I.is_crowbar())
+	if(I.has_tool_quality(TOOL_CROWBAR))
 		if(default_deconstruction_crowbar(user,I))
 			return
-	if(I.is_wrench())
+	if(I.has_tool_quality(TOOL_WRENCH))
 		anchored = !anchored
 		visible_message("<span class='notice'>\The [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].</span>")
 		playsound(src, I.usesound, 75, 1)

diff --git a/code/game/machinery/atm_ret_field.dm b/code/game/machinery/atm_ret_field.dm
@@ -41,33 +41,33 @@
 	field_type = /obj/structure/atmospheric_retention_field/impassable
 
 /obj/machinery/atmospheric_field_generator/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(W.is_crowbar() && isactive)
+	if(W.has_tool_quality(TOOL_CROWBAR) && isactive)
 		if(!src) return
 		to_chat(user, "<span class='warning'>You can't open the ARF-G whilst it's running!</span>")
 		return
-	if(W.is_crowbar() && !isactive)
+	if(W.has_tool_quality(TOOL_CROWBAR) && !isactive)
 		if(!src) return
 		to_chat(user, "<span class='notice'>You [hatch_open? "close" : "open"] \the [src]'s access hatch.</span>")
 		hatch_open = !hatch_open
 		update_icon()
 		if(alwaysactive && wires_intact)
 			generate_field()
 		return
-	if(hatch_open && W.is_multitool())
+	if(hatch_open && W.has_tool_quality(TOOL_MULTITOOL))
 		if(!src) return
 		to_chat(user, "<span class='notice'>You toggle \the [src]'s activation behavior to [alwaysactive? "emergency" : "always-on"].</span>")
 		alwaysactive = !alwaysactive
 		update_icon()
 		return
-	if(hatch_open && W.is_wirecutter())
+	if(hatch_open && W.has_tool_quality(TOOL_WIRECUTTER))
 		if(!src) return
 		to_chat(user, "<span class='warning'>You [wires_intact? "cut" : "mend"] \the [src]'s wires!</span>")
 		wires_intact = !wires_intact
 		update_icon()
 		return
-	if(hatch_open && istype(W,/obj/item/weapon/weldingtool))
+	if(hatch_open && W.has_tool_quality(TOOL_WELDER))
 		if(!src) return
-		var/obj/item/weapon/weldingtool/WT = W
+		var/obj/item/weapon/weldingtool/WT = W.get_welder()
 		if(!WT.isOn()) return
 		if(WT.get_fuel() < 5) // uses up 5 fuel.
 			to_chat(user, "<span class='warning'>You need more fuel to complete this task.</span>")

diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
@@ -239,8 +239,8 @@ update_flag
 	..()
 
 /obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if(istype(W, /obj/item/weapon/weldingtool)) //Vorestart: Deconstructable Canisters
-		var/obj/item/weapon/weldingtool/WT = W
+	if(W.has_tool_quality(TOOL_WELDER)) //Vorestart: Deconstructable Canisters
+		var/obj/item/weapon/weldingtool/WT = W.get_welder()
 		if(!WT.remove_fuel(0, user))
 			to_chat(user, "The welding tool must be on to complete this task.")
 			return
@@ -255,7 +255,7 @@ update_flag
 			qdel(src)
 			return
 	//Voreend
-	if(!W.is_wrench() && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda))
+	if(!W.has_tool_quality(TOOL_WRENCH) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda))
 		visible_message("<span class='warning'>\The [user] hits \the [src] with \a [W]!</span>")
 		src.health -= W.force
 		src.add_fingerprint(user)

diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm
@@ -105,7 +105,7 @@
 	return ..()
 
 /obj/machinery/meter/attackby(var/obj/item/W, var/mob/user)
-	if(W.is_wrench())
+	if(W.has_tool_quality(TOOL_WRENCH))
 		playsound(src, W.usesound, 50, 1)
 		to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
 		if(do_after(user, 40 * W.toolspeed))

diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -117,7 +117,7 @@
 		update_icon()
 		return
 
-	else if (W.is_wrench())
+	else if (W.has_tool_quality(TOOL_WRENCH))
 		if(connected_port)
 			disconnect()
 			to_chat(user, "<span class='notice'>You disconnect \the [src] from the port.</span>")
@@ -173,7 +173,7 @@
 		power_change()
 		return
 
-	if(I.is_screwdriver() && removeable_cell)
+	if(I.has_tool_quality(TOOL_SCREWDRIVER) && removeable_cell)
 		if(!cell)
 			to_chat(user, "<span class='warning'>There is no power cell installed.</span>")
 			return