From e7efac9ca66b78ba0d715a70ba8557d7b655010c Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 4 Aug 2012 14:51:46 +0000
Subject: [PATCH] - Fixed r4301 so it actually does what it set out to do.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4315 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/area/Space Station 13 areas.dm | 8 +-------
 code/game/area/areas.dm                     | 1 -
 code/modules/power/lighting.dm              | 6 +-----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm
index abd28a0f08b..b8c29c287af 100644
--- a/code/defines/area/Space Station 13 areas.dm	
+++ b/code/defines/area/Space Station 13 areas.dm	
@@ -29,8 +29,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	invisibility = INVISIBILITY_LIGHTING
 	var/lightswitch = 1
 
-	var/area_lights_luminosity = 9	//This gets assigned at area creation. It is used to determine how bright the lights in an area should be. At the time of writing the value that it gets assigned is rand(6,9) - only used for light tubes
-
 	var/eject = null
 
 	var/requires_power = 1
@@ -1128,10 +1126,6 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Toxins Mixing Room"
 	icon_state = "toxmix"
 
-/area/toxins/misc_lab
-	name = "Miscellaneous Research"
-	icon_state = "toxtest"
-
 /area/toxins/server
 	name = "\improper Server Room"
 	icon_state = "server"
@@ -1334,7 +1328,7 @@ proc/process_ghost_teleport_locs()
 	icon_state = "ai_upload"
 
 /area/turret_protected/ai_upload_foyer
-	name = "Secure Network Access"
+	name = "Secure Tech Access"
 	icon_state = "ai_foyer"
 
 /area/turret_protected/ai
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 820147954e2..967b610a999 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -41,7 +41,6 @@
 			sd_lighting = 0			// *DAL*
 		else
 			luminosity = 0
-			area_lights_luminosity = rand(6,9)
 			//sd_SetLuminosity(0)		// *DAL*
 
 
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index fd39a87667b..2c76fe048a1 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -243,11 +243,7 @@
 	spawn(2)
 		switch(fitting)
 			if("tube")
-				if(src.loc && src.loc.loc && isarea(src.loc.loc))
-					var/area/A = src.loc.loc
-					brightness = A.area_lights_luminosity
-				else
-					brightness = 9
+				brightness = 8
 				if(prob(10))
 					broken(1)
 			if("bulb")