Merge pull request #1585 from comma/master

Surgery fixes and tweaks

code/modules/mob/living/carbon/metroid/life.dm

@@ -10,11 +10,13 @@
 	if (stat == 2)
 		return
 
+	if(stat == 2)
+		return
+
 	var/datum/gas_mixture/environment // Added to prevent null location errors-- TLE
 	if(src.loc)
 		environment = loc.return_air()
 
-
 	//Apparently, the person who wrote this code designed it so that
 	//blinded get reset each cycle and then get activated later in the
 	//code. Very ugly. I dont care. Moving this stuff here so its easy

code/modules/research/xenoarchaeology/artifact_archaeo.dm

@@ -19,18 +19,21 @@
 
 /obj/item/weapon/ore/strangerock/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/weapon/weldingtool/))
-		if(!src.method)
-			if(inside)
-				var/obj/A = new src.inside(get_turf(src))
-				for(var/mob/M in viewers(world.view, user))
-					M.show_message("\blue The rock burns away revealing a [A.name].",1)
+		var/obj/item/weapon/weldingtool/w = W
+		if(w.isOn() && (w.get_fuel() > 3))
+			if(!src.method)
+				if(inside)
+					var/obj/A = new src.inside(get_turf(src))
+					for(var/mob/M in viewers(world.view, user))
+						M.show_message("\blue The rock burns away revealing a [A.name].",1)
+				else
+					for(var/mob/M in viewers(world.view, user))
+						M.show_message("\blue The rock burns away into nothing.",1)
+				del src
 			else
 				for(var/mob/M in viewers(world.view, user))
-					M.show_message("\blue The rock burns away into nothing.",1)
-			del src
-		else
-			for(var/mob/M in viewers(world.view, user))
-				M.show_message("\blue A few sparks fly off the rock, but otherwise nothing else happens.",1)
+					M.show_message("\blue A few sparks fly off the rock, but otherwise nothing else happens.",1)
+		w.remove_fuel(4)
 
 /obj/item/weapon/ore/strangerock/acid_act(var/datum/reagent/R)
 	if(src.method)