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/assembly/assembly.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 
 /proc/isassembly(O)
 	if(istype(O, /obj/item/device/assembly))
@@ -89,7 +91,7 @@
 		cooldown--
 		if(cooldown <= 0)	return 0
 		spawn(10)
-			process_cooldown()
+		process_cooldown()
 		return 1
 
 
@@ -101,7 +103,7 @@
 		return 1
 
 
-	pulse(var/radio = 0)
+	proc/pulse(var/radio = 0)
 		if(holder && (wires & WIRE_PULSE))
 			holder.process_activation(src, 1, 0)
 		if(holder && (wires & WIRE_PULSE_SPECIAL))
@@ -205,7 +207,6 @@ Desc:	If true is an object that can be attached to an assembly holder but is a s
 
 	proc
 		Activate()//Called when this assembly is pulsed by another one
-		Process_cooldown()//Call this via spawn(10) to have it count down the cooldown var
 		Attach_Holder(var/obj/H, var/mob/user)//Called when an assembly holder attempts to attach, sets src's loc in here
 
 
@@ -233,4 +234,4 @@ Desc:	If true is an object that can be attached to an assembly holder but is a s
 		//Remember to have it set its loc somewhere in here
 
 
-*/
+*/

code/modules/assembly/infrared.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/device/assembly/infra
 	name = "Infrared Beam"
 	desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted."
@@ -11,10 +13,9 @@
 	small_icon_state_left = "infrared_left"
 	small_icon_state_right = "infrared_right"
 
-	var
-		scanning = 0
-		visible = 0
-		obj/effect/beam/i_beam/first = null
+	var/scanning = 0
+	var/visible = 0
+	var/obj/effect/beam/i_beam/first = null
 
 	proc
 		trigger_beam()
@@ -271,4 +272,4 @@
 /obj/effect/beam/i_beam/Del()
 	del(src.next)
 	..()
-	return
+	return

code/modules/assembly/proximity.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/device/assembly/prox_sensor
 	name = "proximity sensor"
 	desc = "Used for scanning and alerting when someone enters a certain proximity."
@@ -11,10 +13,9 @@
 	small_icon_state_left = "prox_left"
 	small_icon_state_right = "prox_right"
 
-	var
-		scanning = 0
-		timing = 0
-		time = 10
+	var/scanning = 0
+	var/timing = 0
+	var/time = 10
 
 	proc
 		toggle_scan()
@@ -153,4 +154,4 @@
 			attack_self(usr)
 
 
-		return
+		return

code/modules/assembly/signaler.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/device/assembly/signaler
 	name = "Remote Signaling Device"
 	desc = "Used to remotely activate devices."
@@ -13,13 +15,12 @@
 	small_icon_state_left = "signaller_left"
 	small_icon_state_right = "signaller_right"
 
-	var
-		code = 30
-		frequency = 1457
-		delay = 0
-		airlock_wire = null
-		datum/radio_frequency/radio_connection
-		deadman = 0
+	var/code = 30
+	var/frequency = 1457
+	var/delay = 0
+	var/airlock_wire = null
+	var/datum/radio_frequency/radio_connection
+	var/deadman = 0
 
 	proc
 		signal()

code/modules/assembly/timer.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/device/assembly/timer
 	name = "timer"
 	desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
@@ -11,9 +13,8 @@
 	small_icon_state_left = "timer_left"
 	small_icon_state_right = "timer_right"
 
-	var
-		timing = 0
-		time = 10
+	var/timing = 0
+	var/time = 10
 
 	proc
 		timer_end()
@@ -114,4 +115,4 @@
 		if(usr)
 			attack_self(usr)
 
-		return
+		return