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/research/circuitprinter.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /*///////////////Circuit Imprinter (By Darem)////////////////////////
 	Used to print new circuit boards (for computers and similar systems) and AI modules. Each circuit board pattern are stored in
 a /datum/desgin on the linked R&D console. You can then print them out in a fasion similar to a regular lathe. However, instead of

code/modules/research/designs.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /***************************************************************
 **						Design Datums						  **
 **	All the data for building stuff and tracking reliability. **
@@ -39,18 +41,17 @@ other types of metals and chemistry for reagents).
 
 datum
 	design						//Datum for object designs, used in construction
-		var
-			name = "Name"					//Name of the created object.
-			desc = "Desc"					//Description of the created object.
-			id = "id"						//ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols
-			list/req_tech = list()			//IDs of that techs the object originated from and the minimum level requirements.
-			reliability_mod = 0				//Reliability modifier of the device at it's starting point.
-			reliability_base = 100			//Base reliability of a device before modifiers.
-			reliability = 100				//Reliability of the device.
-			build_type = null				//Flag as to what kind machine the design is built in. See defines.
-			list/materials = list()			//List of materials. Format: "id" = amount.
-			build_path = ""					//The file path of the object that gets created
-			locked = 0						//If true it will spawn inside a lockbox with currently sec access
+		var/name = "Name"					//Name of the created object.
+		var/desc = "Desc"					//Description of the created object.
+		var/id = "id"						//ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols
+		var/list/req_tech = list()			//IDs of that techs the object originated from and the minimum level requirements.
+		var/reliability_mod = 0				//Reliability modifier of the device at it's starting point.
+		var/reliability_base = 100			//Base reliability of a device before modifiers.
+		var/reliability = 100				//Reliability of the device.
+		var/build_type = null				//Flag as to what kind machine the design is built in. See defines.
+		var/list/materials = list()			//List of materials. Format: "id" = amount.
+		var/build_path = ""					//The file path of the object that gets created
+		var/locked = 0						//If true it will spawn inside a lockbox with currently sec access
 
 		proc
 			//A proc to calculate the reliability of a design based on tech levels and innate modifiers.

code/modules/research/destructive_analyzer.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /*
 Destructive Analyzer
 
@@ -8,9 +10,8 @@ Note: Must be placed within 3 tiles of the R&D Console
 /obj/machinery/r_n_d/destructive_analyzer
 	name = "Destructive Analyzer"
 	icon_state = "d_analyzer"
-	var
-		obj/item/weapon/loaded_item = null
-		decon_mod = 1
+	var/obj/item/weapon/loaded_item = null
+	var/decon_mod = 1
 
 	New()
 		..()
@@ -109,4 +110,4 @@ Note: Must be placed within 3 tiles of the R&D Console
 	icon_state = "d20"
 	g_amt = 5000
 	m_amt = 5000
-	origin_tech = "materials=5;plasmatech=5;syndicate=5;programming=9"*/
+	origin_tech = "materials=5;plasmatech=5;syndicate=5;programming=9"*/

code/modules/research/protolathe.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /*
 Protolathe
 
@@ -11,7 +13,6 @@ Note: Must be placed west/left of and R&D console to function.
 	name = "Protolathe"
 	icon_state = "protolathe"
 	flags = OPENCONTAINER
-
 	var/max_material_storage = 100000 //All this could probably be done better with a list but meh.
 	var/m_amount = 0.0
 	var/g_amount = 0.0

code/modules/research/rdconsole.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /*
 Research and Development (R&D) Console
 
@@ -892,4 +894,4 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				if(linked_imprinter.diamond_amount >= 3750) dat += "<A href='?src=\ref[src];imprinter_ejectsheet=diamond;imprinter_ejectsheet_amt=50'>(Max Sheets)</A>"
 
 		user << browse("<TITLE>Research and Development Console</TITLE><HR>[dat]", "window=rdconsole;size=575x400")
-		onclose(user, "rdconsole")
+		onclose(user, "rdconsole")

code/modules/research/rdmachines.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 //All devices that link into the R&D console fall into thise type for easy identification and some shared procs.
 
 
@@ -6,17 +8,16 @@
 	density = 1
 	anchored = 1
 	use_power = 1
-	var
-		busy = 0
-		hacked = 0
-		disabled = 0
-		shocked = 0
-		list/wires = list()
-		hack_wire
-		disable_wire
-		shock_wire
-		opened = 0
-		obj/machinery/computer/rdconsole/linked_console
+	var/busy = 0
+	var/hacked = 0
+	var/disabled = 0
+	var/shocked = 0
+	var/list/wires = list()
+	var/hack_wire
+	var/disable_wire
+	var/shock_wire
+	var/opened = 0
+	var/obj/machinery/computer/rdconsole/linked_console
 
 	New()
 		..()
@@ -102,4 +103,4 @@
 				if(src.shock_wire == temp_wire)
 					src.shocked = !src.shocked
 					src.shock(usr,50)
-		src.updateUsrDialog()
+		src.updateUsrDialog()

code/modules/research/research.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /*
 General Explination:
 The research datum is the "folder" where all the research information is stored in a R&D console. It's also a holder for all the
@@ -45,12 +47,11 @@ research holder datum.
 ***************************************************************/
 
 /datum/research								//Holder for all the existing, archived, and known tech. Individual to console.
-	var
-		list								//Datum/tech go here.
-			possible_tech = list()			//List of all tech in the game that players have access to (barring special events).
-			known_tech = list()				//List of locally known tech.
-			possible_designs = list()		//List of all designs (at base reliability).
-			known_designs = list()			//List of available designs (at base reliability).
+	//Datum/tech go here.
+	var/list/possible_tech = list()			//List of all tech in the game that players have access to (barring special events).
+	var/list/known_tech = list()				//List of locally known tech.
+	var/list/possible_designs = list()		//List of all designs (at base reliability).
+	var/list/known_designs = list()			//List of available designs (at base reliability).
 
 	New()		//Insert techs into possible_tech here. Known_tech automatically updated.
 		for(var/T in typesof(/datum/tech) - /datum/tech)
@@ -170,12 +171,11 @@ research holder datum.
 
 datum
 	tech		//Datum of individual technologies.
-		var
-			name = "name"					//Name of the technology.
-			desc = "description"			//General description of what it does and what it makes.
-			id = "id"						//An easily referenced ID. Must be alphanumeric, lower-case, and no symbols.
-			level = 1						//A simple number scale of the research level. Level 0 = Secret tech.
-			list/req_tech = list()			//List of ids associated values of techs required to research this tech. "id" = #
+		var/name = "name"					//Name of the technology.
+		var/desc = "description"			//General description of what it does and what it makes.
+		var/id = "id"						//An easily referenced ID. Must be alphanumeric, lower-case, and no symbols.
+		var/level = 1						//A simple number scale of the research level. Level 0 = Secret tech.
+		var/list/req_tech = list()			//List of ids associated values of techs required to research this tech. "id" = #
 
 
 //Trunk Technologies (don't require any other techs and you start knowning them).
@@ -268,4 +268,4 @@ datum
 	var/datum/tech/stored
 	New()
 		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
+		src.pixel_y = rand(-5.0, 5)

code/modules/research/server.dm

@@ -1,18 +1,18 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /obj/machinery/r_n_d/server
 	name = "R&D Server"
 	icon_state = "server"
-	var
-		datum/research/files
-		health = 100
-		list
-			id_with_upload = list()		//List of R&D consoles with upload to server access.
-			id_with_download = list()	//List of R&D consoles with download from server access.
-		id_with_upload_string = ""		//String versions for easy editing in map editor.
-		id_with_download_string = ""
-		server_id = 0
-		heat_gen = 100
-		heating_power = 40000
-		delay = 10
+	var/datum/research/files
+	var/health = 100
+	var/list/id_with_upload = list()		//List of R&D consoles with upload to server access.
+	var/list/id_with_download = list()	//List of R&D consoles with download from server access.
+	var/id_with_upload_string = ""		//String versions for easy editing in map editor.
+	var/id_with_download_string = ""
+	var/server_id = 0
+	var/heat_gen = 100
+	var/heating_power = 40000
+	var/delay = 10
 	req_access = list(access_rd) //Only the R&D can change server settings.
 
 	New()
@@ -159,13 +159,11 @@
 /obj/machinery/computer/rdservercontrol
 	name = "R&D Server Controller"
 	icon_state = "rdcomp"
-	var
-		screen = 0
-		obj/machinery/r_n_d/server/temp_server
-		list
-			servers = list()
-			consoles = list()
-		badmin = 0
+	var/screen = 0
+	var/obj/machinery/r_n_d/server/temp_server
+	var/list/servers = list()
+	var/list/consoles = list()
+	var/badmin = 0
 
 	Topic(href, href_list)
 		if(..())