Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

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

@@ -127,7 +127,7 @@
 			
 				for(var/b=0, b<5, b++)
 					step_towards(W,my_target)
-					if(!W) return
+					if(!W || !W.reagents) return
 					W.reagents.reaction(get_turf(W))
 					for(var/atom/atm in get_turf(W))
 						if(!W)

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

@@ -333,6 +333,7 @@
 			src.force = 15
 			src.damtype = "fire"
 			src.icon_state = "welder1"
+			src.w_class = 4
 			processing_objects.Add(src)
 		else
 			usr << "\blue Need more fuel!"
@@ -347,6 +348,7 @@
 		src.damtype = "brute"
 		src.icon_state = "welder"
 		src.welding = 0
+		src.w_class = initial(src.w_class)
 
 //Decides whether or not to damage a player's eyes based on what they're wearing as protection
 //Note: This should probably be moved to mob
@@ -529,4 +531,4 @@
 	if(!resolved && tool && target)
 		tool.afterattack(target,user,1)
 	if(tool)
-		tool.loc = src*/
+		tool.loc = src*/