Merge pull request #1269 from Erthilo/TGUpdates

TG Updates r3721 to r3745 Redo

code/defines/global.dm

@@ -1,6 +1,6 @@
-//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:04
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
 
-var/global/obj/datacore/data_core = null
+var/global/obj/effect/datacore/data_core = null
 var/global/obj/effect/overlay/plmaster = null
 var/global/obj/effect/overlay/slmaster = null
 
@@ -80,7 +80,7 @@ var/aliens_allowed = 1
 var/ooc_allowed = 1
 var/dooc_allowed = 1
 var/traitor_scaling = 1
-var/goonsay_allowed = 0
+//var/goonsay_allowed = 0
 var/dna_ident = 1
 var/abandon_allowed = 1
 var/enter_allowed = 1

code/defines/obj.dm

@@ -102,7 +102,7 @@
 	anchored = 1.0
 	unacidable = 1
 
-/obj/datacore
+/obj/effect/datacore
 	name = "datacore"
 	var/medical[] = list()
 	var/general[] = list()
@@ -1526,27 +1526,6 @@
 	desc = "You can't resist."
 	// name = ""
 
-
-
-/obj/debug/debugger
-	name =	"Quantum Debugger"
-	desc =  "A quantum debugger used by Centcomm Reality Engineers to help monitor transiant variables."
-	icon = 'stationobjs.dmi'
-	icon_state = "blackbox"
-
-	var/list/list1 = list()
-	var/list/list2 = list()
-	var/list/list3 = list()
-	var/list/list4 = list()
-	var/list/list5 = list()
-	var/list/list6 = list()
-
-	var/var1 = null
-	var/var2 = null
-	var/var3 = null
-	var/var4 = null
-	var/var5 = null
-
 /obj/item/rubberduck
 	name = "rubber duck"
 	desc = "A rubber duck. Quack."

code/defines/turf.dm

@@ -332,7 +332,8 @@
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(istype(W,/obj/item/weapon/weldingtool))
-			if(W:welding)
+			var/obj/item/weapon/weldingtool/WT = W
+			if(WT.remove_fuel(0, user))
 				return TemperatureAct(100)
 		..()