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/modules/power/singularity/collector.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 
 /obj/machinery/power/rad_collector
 	name = "Radiation Collector Array"

code/modules/power/singularity/containment_field.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/machinery/containment_field
 	name = "Containment Field"
 	desc = "An energy field."
@@ -7,9 +9,8 @@
 	density = 0
 	unacidable = 1
 	use_power = 0
-	var
-		obj/machinery/field_generator/FG1 = null
-		obj/machinery/field_generator/FG2 = null
+	var/obj/machinery/field_generator/FG1 = null
+	var/obj/machinery/field_generator/FG2 = null
 
 	New()
 		spawn(1)
@@ -92,4 +93,4 @@
 				return 0
 			FG1 = master1
 			FG2 = master2
-			return 1
+			return 1

code/modules/power/singularity/emitter.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/machinery/emitter
 	name = "Emitter"
 	desc = "A heavy duty industrial laser"

code/modules/power/singularity/field_generator.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 var/containment_fail_announced = 0
 
 /*

code/modules/power/singularity/generator.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 
 /////SINGULARITY SPAWNER
 /obj/machinery/the_singularitygen/
@@ -8,8 +10,7 @@
 	anchored = 0
 	density = 1
 	use_power = 0
-	var
-		energy = 0
+	var/energy = 0
 
 //////////////////////Singularity gen START
 
@@ -56,4 +57,4 @@
 	for (var/obj/X in orange(4,T)) //TODO: do we need requirement to singularity be actually _surrounded_ by field?
 		if(istype(X, /obj/machinery/containment_field) || istype(X, /obj/machinery/shieldwall))
 			checkpointC ++
-	return checkpointC >= 20
+	return checkpointC >= 20

code/modules/power/singularity/particle_accelerator/particle.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/effect/accelerated_particle
 	name = "Accelerated Particles"
 	desc = "Small things moving very fast."
@@ -5,17 +7,16 @@
 	icon_state = "particle"//Need a new icon for this
 	anchored = 1
 	density = 1
-	var
-		movement_range = 10
-		energy = 10		//energy in eV
-		mega_energy = 0	//energy in MeV
-		frequency = 1
-		ionizing = 0
-		particle_type
-		additional_particles = 0
-		turf/target
-		turf/source
-		movetotarget = 1
+	var/movement_range = 10
+	var/energy = 10		//energy in eV
+	var/mega_energy = 0	//energy in MeV
+	var/frequency = 1
+	var/ionizing = 0
+	var/particle_type
+	var/additional_particles = 0
+	var/turf/target
+	var/turf/source
+	var/movetotarget = 1
 	weak
 		movement_range = 8
 		energy = 5

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /*Composed of 7 parts
 3 Particle emitters
 proc

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/machinery/particle_accelerator/control_box
 	name = "Particle Accelerator Control Computer"
 	desc = "This controls the density of the particles."

code/modules/power/singularity/particle_accelerator/particle_emitter.dm

@@ -1,11 +1,12 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/structure/particle_accelerator/particle_emitter
 	name = "EM Containment Grid"
 	desc_holder = "This launchs the Alpha particles, might not want to stand near this end."
 	icon = 'particle_accelerator.dmi'
 	icon_state = "none"
-	var
-		fire_delay = 50
-		last_shot = 0
+	var/fire_delay = 50
+	var/last_shot = 0
 
 	center
 		icon_state = "emitter_center"
@@ -46,4 +47,4 @@
 				if(A)
 					A.dir = src.dir
 					return 1
-			return 0
+			return 0

code/modules/power/singularity/singularity.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 var/global/list/uneatable = list(
 	/turf/space,
 	/obj/effect/overlay,