Updated:

Singularity Engine
-Recoded some parts, still works mostly the same
Welders
-Recoded, it works mostly the same but is easier to use in code
-Cyborgs have a larger fuel tank
-Brought most if not all of the areas that use welders upto spec
Moved the changeling chem recharge code into the human life proc
New players who log out before spawning in are now deleted
New minor Common event
Machines around the station use more power, system might need some changes later
Likely few other minor changes that I just cant think of atm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@945 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/KeelinsStuff.dm

@@ -305,11 +305,11 @@
 		return 0
 
 /proc/do_after(mob/M as mob, time as num)
-	var/turf/T = M.loc
+	var/turf/T = get_turf(M)
 	var/holding = M.equipped()
 	sleep(time)
 	if(M)
-		if ((M.loc == T && M.equipped() == holding && !( M.stat )))
+		if ((get_turf(M) == T && M.equipped() == holding && !( M.stat )))
 			return 1
 		else
 			return 0

code/WorkInProgress/recycling/disposal-construction.dm

@@ -132,33 +132,19 @@
 
 		else if(istype(I, /obj/item/weapon/weldingtool))
 			var/obj/item/weapon/weldingtool/W = I
-			if(W.welding)
-				if(W.get_fuel() > 2)
-					W.use_fuel(2)
-					playsound(src.loc, 'Welder2.ogg', 100, 1)
-
-					// check if anything changed over 2 seconds
-					var/turf/uloc = user.loc
-					var/atom/wloc = W.loc
-					user << "Welding the pipe in place."
-					sleep(20)
-					if(user.loc == uloc && wloc == W.loc)
-
-						update()
-						var/pipetype = dpipetype()
-						var/obj/disposalpipe/P = new pipetype(src.loc)
-						P.base_icon_state = base_state
-						P.dir = dir
-						P.dpdir = dpdir
-						P.updateicon()
-
-						del(src)
-					else
-						user << "You must stay still while welding."
-						return
-
-
-
-				else
-					user << "You need more welding fuel to complete this task."
+			if(W.remove_fuel(2))
+				playsound(src.loc, 'Welder2.ogg', 100, 1)
+				user << "Welding the pipe in place."
+				if(do_after(user, 20))
+					update()
+					var/pipetype = dpipetype()
+					var/obj/disposalpipe/P = new pipetype(src.loc)
+					P.base_icon_state = base_state
+					P.dir = dir
+					P.dpdir = dpdir
+					P.updateicon()
+					del(src)
 					return
+			else
+				user << "You need more welding fuel to complete this task."
+				return

code/WorkInProgress/recycling/disposal.dm

@@ -685,17 +685,14 @@
 			var/obj/item/weapon/weldingtool/W = I
 
 			if(W.welding)
-				if(W.get_fuel() > 3)
-					W.use_fuel(3)
+				if(W.remove_fuel(3))
 					playsound(src.loc, 'Welder2.ogg', 100, 1)
-
 					// check if anything changed over 2 seconds
 					var/turf/uloc = user.loc
 					var/atom/wloc = W.loc
 					user << "Slicing the disposal pipe."
 					sleep(30)
 					if(user.loc == uloc && wloc == W.loc)
-
 						welded()
 					else
 						user << "You must stay still while welding the pipe."