Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi

code/unused/beast/bodypart.dm

@@ -1,7 +1,8 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 datum/bodypart
-	var
-		name = "unidentified bodypart"
-		health = 50
+	var/name = "unidentified bodypart"
+	var/health = 50
 
 datum/bodypart/body
 	health = 100
@@ -12,4 +13,4 @@ datum/bodypart/head
 datum/bodypart/limb
 
 datum/bodypart/tail
-	health = 15
+	health = 15

code/unused/spacecraft/manufacturing.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 // Entirely unfinished. Mostly just bouncing ideas off the code.
 
 
@@ -10,8 +12,7 @@
 	icon = 'mining.dmi'
 	icon_state = "deploycrate"
 	density = 1
-	var
-		payload
+	var/payload
 
 /obj/deploycrate/attack_hand(mob/user as mob)
 	switch(payload)
@@ -30,20 +31,19 @@
 	icon_state = "sprayer"
 	density = 1
 	anchored = 1
-	var
-		payload
-		hacked = 0
-		temp = 100
+	var/payload
+	var/hacked = 0
+	var/temp = 100
 
-		usr_density = 5
-		usr_lastupdate = 0
+	var/usr_density = 5
+	var/usr_lastupdate = 0
 
-		time_started = 0
+	var/time_started = 0
 
-		points = 0
-		totalpoints = 0
+	var/points = 0
+	var/totalpoints = 0
 
-		state = 0 // 0 - Idle, 1 - Spraying, 2 - Done, 3 - Overheated
+	var/state = 0 // 0 - Idle, 1 - Spraying, 2 - Done, 3 - Overheated
 
 obj/machinery/nanosprayer/proc/update_temp()
 	// 1 second : 1 degree
@@ -102,7 +102,7 @@ obj/machinery/nanosprayer/attack_hand(user as mob)
 	var/dat
 	if(..())
 		return
-	dat += text("Core Temp: [temp]<5D>C<BR>")
+	dat += text("Core Temp: [temp]<5D>C<BR>")
 	dat += text("Nanocloud Density: [usr_density] million<BR>")
 	dat += text("\[<A href='?src=\ref[src];minus=1'>-</A> / <A href='?src=\ref[src];plus=1'>+</A>\]<BR>")
 	if(payload)
@@ -171,12 +171,11 @@ obj/machinery/nanosprayer/Topic(href, href_list)
 	icon_state = "sprayer"
 	density = 1
 	anchored = 1
-	var
-		locked = 0
-		closed = 0
-		state = 0 // 0 - Idle, 1 - Smelt, 2 - Cool, 3 - Clean
-		slag = 0
-		hacked = 0
+	var/locked = 0
+	var/closed = 0
+	var/state = 0 // 0 - Idle, 1 - Smelt, 2 - Cool, 3 - Clean
+	var/slag = 0
+	var/hacked = 0
 
 obj/machinery/smelter/attack_hand(user as mob)
 	var/dat
@@ -239,11 +238,10 @@ obj/machinery/smelter/Topic(href, href_list)
 	density = 1
 	anchored = 1
 
-	var
-		gameticker
-		gameworld
+	var/gameticker
+	var/gameworld
 
 	New()
 		..()
 		gameticker = ticker
-		gameworld = world
+		gameworld = world

code/unused/spacecraft/shipcore.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /obj/machinery/shipcore
 	icon = 'craft.dmi'
 	icon_state = "core"
@@ -193,10 +195,9 @@ obj/machinery/shipcore/Topic(href, href_list)
 obj/machinery/ship_component
 	name = "ship component"
 	icon = 'craft.dmi'
-	var
-		obj/machinery/shipcore/core
-		required_draw = 0
-		active = 1
+	var/obj/machinery/shipcore/core
+	var/required_draw = 0
+	var/active = 1
 
 	proc
 		draw_power(var/n as num)
@@ -213,10 +214,9 @@ obj/machinery/ship_component/thruster
 	density = 1
 	opacity = 1
 
-	var
-		cooldown = 600 // In 1/10th seconds
-		lastused
-		ready = 0
+	var/cooldown = 600 // In 1/10th seconds
+	var/lastused
+	var/ready = 0
 	required_draw = 100
 
 	proc
@@ -249,9 +249,8 @@ obj/machinery/ship_component/engine
 	density = 1
 	opacity = 1
 
-	var
-		charge = 1000
-		capacity = 1000
+	var/charge = 1000
+	var/capacity = 1000
 
 	draw_power(var/n as num)
 		if(charge >= n)
@@ -346,4 +345,4 @@ obj/machinery/ship_component/control_panel
 			if(!active)
 				return
 			src.active = 0
-			src.anchored = 0
+			src.anchored = 0