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/game/objects/items/weapons/implants/implant.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/weapon/implant
 	name = "implant"
 	desc = "An implant. Not usually seen outside a body."

code/game/objects/items/weapons/implants/implantcase.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/weapon/implantcase
 	name = "Glass Case"
 	desc = "A case containing an implant."
@@ -6,8 +8,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 1.0
-	var
-		obj/item/weapon/implant/imp = null
+	var/obj/item/weapon/implant/imp = null
 	proc
 		update()
 
@@ -125,4 +126,4 @@
 	New()
 		src.imp = new /obj/item/weapon/implant/death_alarm( src )
 		..()
-		return
+		return

code/game/objects/items/weapons/implants/implantchair.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/machinery/implantchair
 	name = "Loyalty Implanter"
 	desc = "Used to implant occupants with loyalty implants."
@@ -7,16 +9,15 @@
 	opacity = 0
 	anchored = 1
 
-	var
-		ready = 1
-		malfunction = 0
-		list/obj/item/weapon/implant/loyalty/implant_list = list()
-		max_implants = 5
-		injection_cooldown = 600
-		replenish_cooldown = 6000
-		replenishing = 0
-		mob/living/carbon/occupant = null
-		injecting = 0
+	var/ready = 1
+	var/malfunction = 0
+	var/list/obj/item/weapon/implant/loyalty/implant_list = list()
+	var/max_implants = 5
+	var/injection_cooldown = 600
+	var/replenish_cooldown = 6000
+	var/replenishing = 0
+	var/mob/living/carbon/occupant = null
+	var/injecting = 0
 
 	proc
 		go_out()

code/game/objects/items/weapons/implants/implanter.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/weapon/implanter
 	name = "implanter"
 	icon = 'items.dmi'
@@ -6,8 +8,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	var
-		obj/item/weapon/implant/imp = null
+	var/obj/item/weapon/implant/imp = null
 	proc
 		update()
 
@@ -108,4 +109,4 @@
 			var/obj/item/weapon/implant/compressed/c = imp
 			c.scanned = A
 			A.loc.contents.Remove(A)
-			update()
+			update()

code/game/objects/items/weapons/implants/implantfreedom.dm

@@ -1,10 +1,11 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/weapon/implant/freedom
 	name = "freedom"
 	desc = "Use this to escape from those evil Red Shirts."
 	color = "r"
-	var
-		activation_emote = "chuckle"
-		uses = 1.0
+	var/activation_emote = "chuckle"
+	var/uses = 1.0
 
 
 	New()

code/game/objects/items/weapons/implants/implantpad.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/weapon/implantpad
 	name = "implantpad"
 	desc = "Used to modify implants."
@@ -7,10 +9,9 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = 2.0
-	var
-		obj/item/weapon/implantcase/case = null
-		broadcasting = null
-		listening = 1.0
+	var/obj/item/weapon/implantcase/case = null
+	var/broadcasting = null
+	var/listening = 1.0
 	proc
 		update()