Merge pull request #1191 from Mloc/varfix

Huge commit!  Standardizes var definitions in most places.

code/modules/mob/living/blob/blob.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /mob/living/blob
 	name = "blob fragment"
 	real_name = "blob fragment"
@@ -6,9 +8,8 @@
 	pass_flags = PASSBLOB
 	see_in_dark = 8
 	see_invisible = 2
-	var
-		ghost_name = "Unknown"
-		creating_blob = 0
+	var/ghost_name = "Unknown"
+	var/creating_blob = 0
 
 
 	New()

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -1,10 +1,11 @@
-/mob/living/carbon/alien/humanoid
-	var
-		oxygen_alert = 0
-		toxins_alert = 0
-		fire_alert = 0
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
 
-		temperature_alert = 0
+/mob/living/carbon/alien/humanoid
+	var/oxygen_alert = 0
+	var/toxins_alert = 0
+	var/fire_alert = 0
+
+	var/temperature_alert = 0
 
 
 /mob/living/carbon/alien/humanoid/Life()

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -1,10 +1,11 @@
-/mob/living/carbon/alien/larva
-	var
-		oxygen_alert = 0
-		toxins_alert = 0
-		fire_alert = 0
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
 
-		temperature_alert = 0
+/mob/living/carbon/alien/larva
+	var/oxygen_alert = 0
+	var/toxins_alert = 0
+	var/fire_alert = 0
+
+	var/temperature_alert = 0
 
 
 /mob/living/carbon/alien/larva/Life()

code/modules/mob/living/carbon/brain/MMI.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/device/mmi
 	name = "Man-Machine Interface"
 	desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
@@ -14,11 +16,10 @@
 
 	//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
 
-	var
-		locked = 0
-		mob/living/carbon/brain/brainmob = null//The current occupant.
-		mob/living/silicon/robot = null//Appears unused.
-		obj/mecha = null//This does not appear to be used outside of reference in mecha.dm.
+	var/locked = 0
+	var/mob/living/carbon/brain/brainmob = null//The current occupant.
+	var/mob/living/silicon/robot = null//Appears unused.
+	var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm.
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
 		if(istype(O,/obj/item/brain) && !brainmob) //Time to stick a brain in it --NEO
@@ -132,4 +133,4 @@
 				brainmob << "Can't do that while incapacitated or dead."
 
 			radio.listening = radio.listening==1 ? 0 : 1
-			brainmob << "\blue Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast."
+			brainmob << "\blue Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast."

code/modules/mob/living/carbon/brain/brain.dm

@@ -1,7 +1,8 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /mob/living/carbon/brain
-	var
-		obj/item/container = null
-		timeofhostdeath = 0
+	var/obj/item/container = null
+	var/timeofhostdeath = 0
 
 	New()
 		var/datum/reagents/R = new/datum/reagents(1000)
@@ -41,4 +42,4 @@
 	if (!container || !istype(container, /obj/item/device/mmi))
 		src.verbs += /mob/proc/ghost
 
-	return
+	return

code/modules/mob/living/carbon/human/life.dm

@@ -1,19 +1,20 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 #define HUMAN_MAX_OXYLOSS 3 //Defines how much oxyloss humans can get per tick. No air applies this value.
 
 /mob/living/carbon/human
-	var
-		oxygen_alert = 0
-		toxins_alert = 0
-		fire_alert = 0
+	var/oxygen_alert = 0
+	var/toxins_alert = 0
+	var/fire_alert = 0
 
-		temperature_alert = 0
+	var/temperature_alert = 0
 
 		// used to do some stuff only on every X life tick
-		life_tick = 0
-		isbreathing = 1
-		holdbreath = 0
-		lyingcheck = 0
-		buckle_check = 0
+	var/life_tick = 0
+	var/isbreathing = 1
+	var/holdbreath = 0
+	var/lyingcheck = 0
+	var/buckle_check = 0
 
 /mob/living/carbon/human/Life()
 	set invisibility = 0

code/modules/mob/living/parasite/meme.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 // === MEMETIC ANOMALY ===
 // =======================
 
@@ -18,8 +20,7 @@ var/global/const/MAXIMUM_MEME_POINTS = 750
 mob/living/carbon/var/list/parasites = list()
 
 mob/living/parasite
-	var
-		mob/living/carbon/host // the host that this parasite occupies
+	var/mob/living/carbon/host // the host that this parasite occupies
 
 	Login()
 		..()
@@ -592,4 +593,4 @@ mob/living/parasite/check_contents_for(t)
 mob/living/parasite/check_contents_for_reagent(t)
 	if(!host) return 0
 
-	return host.check_contents_for_reagent(t)
+	return host.check_contents_for_reagent(t)

code/modules/mob/living/silicon/pai/recruit.dm

@@ -1,15 +1,16 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 // Recruiting observers to play as pAIs
 
 var/datum/paiController/paiController			// Global handler for pAI candidates
 
 /datum/paiCandidate
-	var
-		name
-		key
-		description
-		role
-		comments
-		ready = 0
+	var/name
+	var/key
+	var/description
+	var/role
+	var/comments
+	var/ready = 0
 
 
 
@@ -217,4 +218,4 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 			if(response == "Yes")
 				recruitWindow(C.mob)
 			else if (response == "Never for this round")
-				C.be_pai = 0
+				C.be_pai = 0

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /obj/item/weapon/robot_module
 	name = "robot module"
 	icon = 'module.dmi'
@@ -5,10 +7,9 @@
 	w_class = 100.0
 	item_state = "electronic"
 	flags = FPRINT|TABLEPASS | CONDUCT
-	var
-		list/modules = list()
-		obj/item/emag = null
-		obj/item/borg/upgrade/jetpack = null
+	var/list/modules = list()
+	var/obj/item/emag = null
+	var/obj/item/borg/upgrade/jetpack = null
 
 
 	emp_act(severity)

code/modules/mob/mob_helpers.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 
 // fun if you want to typecast humans/monkeys/etc without writing long path-filled lines.
 /proc/ishuman(A)
@@ -212,10 +214,10 @@ proc/hasorgans(A)
 
 proc/slur(phrase)
 	phrase = html_decode(phrase)
-	var
-		leng=lentext(phrase)
-		counter=lentext(phrase)
-		newphrase="";newletter=""
+	var/leng=lentext(phrase)
+	var/counter=lentext(phrase)
+	var/newphrase=""
+	var/newletter=""
 	while(counter>=1)
 		newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
 		if(rand(1,3)==3)

code/modules/mob/mob_movement.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /mob/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(air_group || (height==0)) return 1
 
@@ -223,8 +225,7 @@
 	if(mob.stat==2)	return
 
 	if(isAI(mob))	return AIMove(n,direct,mob)
-
-	if(mob.monkeyizing)	return//This is sota the goto stop mobs from moving var
+	if(mob.monkeyizing)  return //This is sota the goto stop mobs from moving var
 
 	if(mob.incorporeal_move)//Move though walls
 		Process_Incorpmove(direct)

code/modules/mob/new_player/new_player.dm

@@ -1,10 +1,11 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 /mob/new_player
-	var
-		datum/preferences/preferences = null
-		ready = 0
-		spawning = 0//Referenced when you want to delete the new_player later on in the code.
-		totalPlayers = 0		 //Player counts for the Lobby tab
-		totalPlayersReady = 0
+	var/datum/preferences/preferences = null
+	var/ready = 0
+	var/spawning = 0//Referenced when you want to delete the new_player later on in the code.
+	var/totalPlayers = 0		 //Player counts for the Lobby tab
+	var/totalPlayersReady = 0
 
 	invisibility = 101
 

code/modules/mob/new_player/preferences.dm

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
+
 #define UI_OLD 0
 #define UI_NEW 1
 
@@ -29,18 +31,17 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"infested monkey" = ispath(text2path("/datum/game_mode/monkey")),
 )
 */
-var/const
-	BE_TRAITOR   =(1<<0)
-	BE_OPERATIVE =(1<<1)
-	BE_CHANGELING=(1<<2)
-	BE_WIZARD    =(1<<3)
-	BE_MALF      =(1<<4)
-	BE_REV       =(1<<5)
-	BE_ALIEN     =(1<<6)
-	BE_CULTIST   =(1<<7)
-	BE_MONKEY    =(1<<8)
-	BE_PAI       =(1<<9)
-	BE_MEME		 =(1<<10)
+var/const/BE_TRAITOR   =(1<<0)
+var/const/BE_OPERATIVE =(1<<1)
+var/const/BE_CHANGELING=(1<<2)
+var/const/BE_WIZARD    =(1<<3)
+var/const/BE_MALF      =(1<<4)
+var/const/BE_REV       =(1<<5)
+var/const/BE_ALIEN     =(1<<6)
+var/const/BE_CULTIST   =(1<<7)
+var/const/BE_MONKEY    =(1<<8)
+var/const/BE_PAI       =(1<<9)
+var/const/BE_MEME		 =(1<<10)
 
 
 
@@ -1093,4 +1094,4 @@ datum/preferences
 		character.disabilities = disabilities
 
 #undef UI_OLD
-#undef UI_NEW
+#undef UI_NEW

code/modules/mob/organ/organ.dm

@@ -1,10 +1,11 @@
-/datum/organ
-	var
-		name = "organ"
-		mob/living/carbon/human/owner = null
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
 
-		list/datum/autopsy_data/autopsy_data = list()
-		list/trace_chemicals = list() // traces of chemicals in the organ,
+/datum/organ
+	var/name = "organ"
+	var/mob/living/carbon/human/owner = null
+
+	var/list/datum/autopsy_data/autopsy_data = list()
+	var/list/trace_chemicals = list() // traces of chemicals in the organ,
 								      // links chemical IDs to number of ticks for which they'll stay in the blood
 
 
@@ -15,12 +16,11 @@
 		return 0
 
 /datum/autopsy_data
-	var
-		weapon = null
-		pretend_weapon = null
-		damage = 0
-		hits = 0
-		time_inflicted = 0
+	var/weapon = null
+	var/pretend_weapon = null
+	var/damage = 0
+	var/hits = 0
+	var/time_inflicted = 0
 
 	proc/copy()
 		var/datum/autopsy_data/W = new()
@@ -36,38 +36,37 @@
 ****************************************************/
 /datum/organ/external
 	name = "external"
-	var
-		icon_name = null
-		body_part = null
+	var/icon_name = null
+	var/body_part = null
 
-		damage_state = "00"
-		brute_dam = 0
-		burn_dam = 0
-		bandaged = 0
-		max_damage = 0
-		max_size = 0
-		tmp/list/obj/item/weapon/implant/implant = list()
+	var/damage_state = "00"
+	var/brute_dam = 0
+	var/burn_dam = 0
+	var/bandaged = 0
+	var/max_damage = 0
+	var/max_size = 0
+	var/tmp/list/obj/item/weapon/implant/implant = list()
 
-		display_name
-		tmp/list/wounds = list()
-		tmp/bleeding = 0
-		tmp/perma_injury = 0
-		tmp/perma_dmg = 0
-		tmp/broken = 0
-		tmp/destroyed = 0
-		tmp/destspawn = 0 //Has it spawned the broken limb?
-		tmp/gauzed = 0 //Has the missing limb been patched?
-		tmp/robot = 0 //ROBOT ARM MAN!
-		tmp/cutaway = 0 //First part of limb reattachment.
-		tmp/attachable = 0 //Can limb be attached?
-		min_broken_damage = 30
-		datum/organ/external/parent
-		list/datum/organ/external/children
-		damage_msg = "\red You feel a intense pain"
+	var/display_name
+	var/tmp/list/wounds = list()
+	var/tmp/bleeding = 0
+	var/tmp/perma_injury = 0
+	var/tmp/perma_dmg = 0
+	var/tmp/broken = 0
+	var/tmp/destroyed = 0
+	var/tmp/destspawn = 0 //Has it spawned the broken limb?
+	var/tmp/gauzed = 0 //Has the missing limb been patched?
+	var/tmp/robot = 0 //ROBOT ARM MAN!
+	var/tmp/cutaway = 0 //First part of limb reattachment.
+	var/tmp/attachable = 0 //Can limb be attached?
+	var/min_broken_damage = 30
+	var/datum/organ/external/parent
+	var/list/datum/organ/external/children
+	var/damage_msg = "\red You feel a intense pain"
 
-		var/open = 0
-		var/stage = 0
-		var/wound = 0
+	var/open = 0
+	var/stage = 0
+	var/wound = 0
 
 	New(mob/living/carbon/H)
 		..(H)
@@ -602,4 +601,4 @@
 				INTERNAL ORGANS
 ****************************************************/
 /datum/organ/internal
-	name = "internal"
+	name = "internal"