Merge branch 'master' into upstream-merge-33055

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

@@ -21,7 +21,7 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30)
 	resistance_flags = FIRE_PROOF
 
-	materials = list(MAT_METAL=70, MAT_GLASS=30)
+	materials = list(MAT_METAL=70, MAT_GLASS=30)
 	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
 	var/status = TRUE 		//Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
 	var/max_fuel = 20 	//The max amount of fuel the welder can hold
@@ -51,7 +51,7 @@
 	cut_overlays()
 	if(change_icons)
 		var/ratio = get_fuel() / max_fuel
-		var/ratio = get_fuel() / max_fuel
+		ratio = CEILING(ratio*4, 1) * 25
 		add_overlay("[initial(icon_state)][ratio]")
 	update_torch()
 	return
@@ -89,18 +89,15 @@
 		flamethrower_screwdriver(I, user)
 	else if(istype(I, /obj/item/stack/rods))
 		flamethrower_rods(I, user)
-		flamethrower_rods(I, user)
-	else if(istype(I, /obj/item/reagent_containers) && I.is_open_container())
-		var/amountNeeded = max_fuel - get_fuel()
-		var/obj/item/reagent_containers/container = I
-		if(length(container.reagents.reagent_list) > 1)
-			to_chat(user, "<span class='warning'>[container] has too many chemicals mixed into it. You wouldn't want to put the wrong chemicals into [src].</span>")
-			return ..()
-		if(amountNeeded > 0 && container.reagents.has_reagent("welding_fuel"))
-			container.reagents.trans_id_to(src, "welding_fuel", amountNeeded)
 	else
-	else
+		. = ..()
+	update_icon()
 
+/obj/item/weldingtool/proc/explode()
+	var/turf/T = get_turf(loc)
+	var/plasmaAmount = reagents.get_reagent_amount("plasma")
+	dyn_explosion(T, plasmaAmount/5)//20 plasma in a standard welder has a 4 power explosion. no breaches, but enough to kill/dismember holder
+	qdel(src)
 
 /obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user)
 	if(!istype(H))
@@ -123,7 +120,10 @@
 /obj/item/weldingtool/afterattack(atom/O, mob/user, proximity)
 	if(!proximity)
 		return
-		return
+	if(!status && O.is_refillable())
+		reagents.trans_to(O, reagents.total_volume)
+		to_chat(user, "<span class='notice'>You empty [src]'s fuel tank into [O].</span>")
+		update_icon()
 	if(welding)
 		remove_fuel(1)
 		var/turf/location = get_turf(user)
@@ -139,6 +139,9 @@
 
 
 /obj/item/weldingtool/attack_self(mob/user)
+	if(src.reagents.has_reagent("plasma"))
+		message_admins("[key_name_admin(user)] activated a rigged welder.")
+		explode()
 	switched_on(user)
 	if(welding)
 		set_light(light_intensity)
@@ -234,9 +237,11 @@
 		return
 	status = !status
 	if(status)
-	if(status)
+		to_chat(user, "<span class='notice'>You resecure [src] and close the fuel tank.</span>")
+		container_type = NONE
 	else
-	else
+		to_chat(user, "<span class='notice'>[src] can now be attached, modified, and refuelled.</span>")
+		container_type = OPENCONTAINER
 	add_fingerprint(user)
 
 /obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)
@@ -264,7 +269,7 @@
 	desc = "A slightly larger welder with a larger tank."
 	icon_state = "indwelder"
 	max_fuel = 40
-	max_fuel = 40
+	materials = list(MAT_GLASS=60)
 
 /obj/item/weldingtool/largetank/cyborg
 	name = "integrated welding tool"
@@ -294,7 +299,7 @@
 	icon_state = "welder"
 	toolspeed = 0.1
 	light_intensity = 0
-	toolspeed = 0.1
+	change_icons = 0
 
 /obj/item/weldingtool/abductor/process()
 	if(get_fuel() <= max_fuel)
@@ -307,7 +312,7 @@
 	icon_state = "upindwelder"
 	item_state = "upindwelder"
 	max_fuel = 80
-	icon_state = "upindwelder"
+	materials = list(MAT_METAL=70, MAT_GLASS=120)
 
 /obj/item/weldingtool/experimental
 	name = "experimental welding tool"
@@ -315,7 +320,7 @@
 	icon_state = "exwelder"
 	item_state = "exwelder"
 	max_fuel = 40
-	desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
+	materials = list(MAT_METAL=70, MAT_GLASS=120)
 	var/last_gen = 0
 	change_icons = 0
 	can_off_process = 1
@@ -336,4 +341,5 @@
 	if(get_fuel() < max_fuel && nextrefueltick < world.time)
 		nextrefueltick = world.time + 10
 		reagents.add_reagent("welding_fuel", 1)
-/obj/item/weldingtool/experimental/process()
+
+#undef WELDER_FUEL_BURN_INTERVAL