Merge pull request #43 from Markolie/master

HUD fixes, Vox naming change, Beepsky ID fix, IPC fixes

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

@@ -463,7 +463,6 @@
 	item_state = "crowbar_red"
 
 /obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
-
 	if(hasorgans(M))
 
 		var/datum/organ/external/S = M:organs_by_name[user.zone_sel.selecting]
@@ -480,14 +479,27 @@
 					return
 
 		if(S.brute_dam)
-			S.heal_damage(15,0,0,1)
-			user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].")
-			if(istype(M,/mob/living/carbon/human))
-				var/mob/living/carbon/human/H = M
-				H.updatehealth()
-			return
+			var/obj/item/weapon/weldingtool/WT = src
+			if (WT.remove_fuel(0,user))
+				playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+				S.heal_damage(15,0,0,1)
+				user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].")
+				if(istype(M,/mob/living/carbon/human))
+					var/mob/living/carbon/human/H = M
+					H.updatehealth()
+					if(istype(M,/mob/living/carbon/human/machine) && M.stat == 0) // If an IPC is brought back to life by welding it, which is possible, update the mob list
+						if(M in dead_mob_list)
+							dead_mob_list -= M
+							respawnable_list -= M
+							living_mob_list += M
+							mob_list += M
+				return
+			else
+				user << "\red You need more welding fuel to complete this task."
+				return
 		else
 			user << "Nothing to fix!"
+			return
 
 	else
 		return ..()