Merge branch 'master' into placeholder

code/game/objects/items.dm

@@ -875,3 +875,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 	. += "Dismemberment: [edge ? "likely to dismember" : "unlikely to dismember"]<br>"
 	. += "Penetration: [armor_penetration]<br>"
 	. += "Throw Force: [throwforce]<br>"
+
+/obj/item/proc/use_resource(var/mob/user, var/use_amount)
+	return

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

@@ -81,7 +81,7 @@
 	if(W.isscrewdriver())  // Turning it into a crossbow
 		crafting = !crafting
 		if(!crafting)
-			to_chat(user, SPAN_NOTICE("You reassemble the RFD"))
+			to_chat(user, SPAN_NOTICE("You reassemble the RFD."))
 		else
 			to_chat(user, SPAN_NOTICE("The RFD can now be modified."))
 		src.add_fingerprint(user)
@@ -110,9 +110,9 @@
 			var/obj/item/gun/launcher/crossbow/RFD/CB = new(get_turf(user)) // can be found in crossbow.dm
 			forceMove(CB)
 			CB.stored_matter = src.stored_matter
+			user.drop_from_inventory(src)
 			qdel(src)
 			user.put_in_hands(CB)
-			add_fingerprint(user)
 			return
 	..()
 

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

@@ -465,6 +465,10 @@
 			to_chat(M, SPAN_NOTICE("You need more welding fuel to complete this task."))
 		return 0
 
+/obj/item/weldingtool/use_resource(mob/user, var/use_amount)
+	if(get_fuel() >= use_amount)
+		reagents.remove_reagent(/decl/reagent/fuel, use_amount)
+
 //Returns whether or not the welding tool is currently on.
 /obj/item/weldingtool/proc/isOn()
 	return src.welding

code/game/objects/structures/girders.dm

@@ -87,10 +87,14 @@
 				reset_girder()
 
 	else if(istype(W, /obj/item/gun/energy/plasmacutter))
-		to_chat(user, "<span class='notice'>Now slicing apart the girder...</span>")
-		if(do_after(user,30/W.toolspeed))
-			if(!src) return
-			to_chat(user, "<span class='notice'>You slice apart the girder!</span>")
+		var/obj/item/gun/energy/plasmacutter/PC = W
+		to_chat(user, SPAN_NOTICE("You start lining up \the [PC] to the joints of \the [src]..."))
+		if(do_after(user, 2 SECONDS))
+			if(!src)
+				return
+			playsound(loc, PC.fire_sound, 100, 1)
+			to_chat(user, SPAN_NOTICE("You blast apart the girder!"))
+			W.use_resource(user, 1)
 			dismantle()
 
 	else if(istype(W, /obj/item/melee/energy))

code/game/objects/structures/grille.dm

@@ -102,10 +102,10 @@
 			qdel(src)
 	else if(istype(W, /obj/item/gun/energy/plasmacutter))
 		var/obj/item/gun/energy/plasmacutter/PC = W
-		if(!PC.power_supply)
-			to_chat(user, SPAN_WARNING("\The [src] doesn't have a power supply installed!"))
+		if(PC.check_power_and_message(user))
 			return
-		playsound(get_turf(src), PC.fire_sound, 100, TRUE)
+		PC.use_resource(user, 1)
+		playsound(loc, PC.fire_sound, 100, TRUE)
 		new /obj/item/stack/rods(get_turf(src), destroyed ? 1 : 2)
 		qdel(src)
 	else if((W.isscrewdriver()) && (istype(loc, /turf/simulated) || anchored))