Fixes not being able to light thermite on clockwork walls with a weld…

…ing tool

code/game/objects/structures/girders.dm

@@ -58,7 +58,7 @@
 	else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
 		user << "<span class='notice'>You start slicing apart the girder...</span>"
 		playsound(src, 'sound/items/Welder.ogg', 100, 1)
-		if(do_after(user, 30, target = src))
+		if(do_after(user, 40*W.toolspeed, target = src))
 			user << "<span class='notice'>You slice apart the girder.</span>"
 			var/obj/item/stack/sheet/metal/M = new (loc, 2)
 			M.add_fingerprint(user)
@@ -331,7 +331,7 @@
 	else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
 		user << "<span class='notice'>You start slicing apart the girder...</span>"
 		playsound(src, 'sound/items/Welder.ogg', 100, 1)
-		if(do_after(user, 30, target = src))
+		if(do_after(user, 40*W.toolspeed, target = src))
 			user << "<span class='notice'>You slice apart the girder.</span>"
 			var/obj/item/stack/sheet/runed_metal/R = new(get_turf(src))
 			R.amount = 1

code/game/objects/structures/statues.dm

@@ -46,7 +46,7 @@
 		playsound(src, 'sound/items/Welder.ogg', 100, 1)
 		user.visible_message("[user] is slicing apart the [name]...", \
 							 "<span class='notice'>You are slicing apart the [name]...</span>")
-		if(do_after(user,30, target = src))
+		if(do_after(user,40*W.toolspeed, target = src))
 			if(!src.loc)
 				return
 			user.visible_message("[user] slices apart the [name].", \

code/game/turfs/simulated/wall/misc_walls.dm

@@ -43,6 +43,7 @@
 	desc = "A huge chunk of warm metal. The clanging of machinery emanates from within."
 	explosion_block = 2
 	hardness = 10
+	slicing_duration = 120
 	sheet_type = /obj/item/stack/tile/brass
 	sheet_amount = 1
 	girder_type = /obj/structure/destructible/clockwork/wall_gear
@@ -72,23 +73,6 @@
 		realappearence = null
 	return ..()
 
-
-/turf/closed/wall/clockwork/attackby(obj/item/I, mob/living/user, params)
-	if(istype(I, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = I
-		if(!WT.remove_fuel(0,user))
-			return 0
-		playsound(src, WT.usesound, 100, 1)
-		user.visible_message("<span class='notice'>[user] begins slowly breaking down [src]...</span>", "<span class='notice'>You begin painstakingly destroying [src]...</span>")
-		if(!do_after(user, 120*WT.toolspeed, target = src))
-			return 0
-		if(!WT.remove_fuel(1, user))
-			return 0
-		user.visible_message("<span class='notice'>[user] breaks apart [src]!</span>", "<span class='notice'>You break apart [src]!</span>")
-		dismantle_wall()
-		return 1
-	return ..()
-
 /turf/closed/wall/clockwork/narsie_act()
 	..()
 	if(istype(src, /turf/closed/wall/clockwork)) //if we haven't changed type
@@ -115,7 +99,6 @@
 		else
 			O.loc = src
 
-
 /turf/closed/wall/clockwork/devastate_wall()
 	for(var/i in 1 to 2)
 		new/obj/item/clockwork/alloy_shards/large(src)

code/game/turfs/simulated/wall/reinf_walls.dm

@@ -189,7 +189,7 @@
 			if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
 				user << "<span class='notice'>You begin slicing through the support rods...</span>"
 				playsound(src, 'sound/items/Welder.ogg', 100, 1)
-				if(do_after(user, 70*W.toolspeed, target = src))
+				if(do_after(user, 100*W.toolspeed, target = src))
 					if(!istype(src, /turf/closed/wall/r_wall) || !W || d_state != SUPPORT_RODS)
 						return 1
 					d_state = SHEATH

code/game/turfs/simulated/walls.dm

@@ -183,7 +183,7 @@
 	else if( istype(W, /obj/item/weapon/gun/energy/plasmacutter) )
 		user << "<span class='notice'>You begin slicing through the outer plating...</span>"
 		playsound(src, 'sound/items/Welder.ogg', 100, 1)
-		if(do_after(user, slicing_duration*0.6, target = src))  // plasma cutter is faster than welding tool
+		if(do_after(user, slicing_duration*W.toolspeed, target = src))
 			if(!iswallturf(src) || !user || !W || !T)
 				return 1
 			if( user.loc == T && user.get_active_held_item() == W )

code/modules/projectiles/guns/energy/special.dm

@@ -132,6 +132,7 @@
 	sharpness = IS_SHARP
 	can_charge = 0
 	heat = 3800
+	toolspeed = 0.7 //plasmacutters can be used as welders for a few things, and are faster than standard welders
 
 /obj/item/weapon/gun/energy/plasmacutter/examine(mob/user)
 	..()