Quick fixes for my last commit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2961 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/area/Space Station 13 areas.dm

@@ -84,7 +84,7 @@ proc/process_ghost_teleport_locs()
 			ghostteleportlocs += AR.name
 			ghostteleportlocs[AR.name] = AR
 		var/turf/picked = pick(get_area_turfs(AR.type))
-		if (picked.z == 1 || picked.z == 5)
+		if (picked.z == 1 || picked.z == 5 || picked.z == 3)
 			ghostteleportlocs += AR.name
 			ghostteleportlocs[AR.name] = AR
 

code/game/machinery/telecomms/logbrowser.dm

@@ -67,26 +67,22 @@
 					var/mobtype = C.parameters["mobtype"]
 					var/mob/M = new mobtype
 
-					if(istype(M, /mob/living/carbon/human))
+					if(ishuman() || isbrain(M))
 						race = "Human"
 
-					else if(istype(M, /mob/living/carbon/monkey))
+					else if(ismonkey())
 						race = "Monkey"
 						language = race
 
-					else if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/metroid))
-						race = "Alien"
-						language = race
-
-					else if(istype(M, /mob/living/silicon))
+					else if(issilicon() || C.parameters["job"] = "AI") // sometimes M gets deleted prematurely for AIs... just check the job
 						race = "Artificial Life"
 
-					else if(istype(M, /mob/living/simple_animal/corgi))
-						race = "Dog"
+					else if(ismetroid()) // NT knows a lot about metroids, but not aliens. Can identify metroids
+						race = "Metroid"
 						language = race
 
-					else if(istype(M, /mob/living/simple_animal/cat))
-						race = "Cat"
+					else if(isanimal())
+						race = "Domestic Animal"
 						language = race
 
 					else

code/game/machinery/telecomms/telecomunications.dm

@@ -15,7 +15,7 @@
 	var
 		list/links = list() // list of machines this machine is linked to
 		traffic = 0 // value increases as traffic increases
-		netspeed = 1 // how much traffic to lose per tick (50 gigabytes/second * netspeed)
+		netspeed = 5 // how much traffic to lose per tick (50 gigabytes/second * netspeed)
 		list/autolinkers = list() // list of text/number values to link with
 		id = "NULL" // identification string
 		network = "NULL" // the network of the machinery
@@ -157,6 +157,8 @@
 		// Update the icon
 		update_icon()
 
+		if(traffic > 0)
+			traffic -= netspeed
 		/* Machine checks */
 		if(on)
 			if(machinetype == 2) // bus mainframes
@@ -185,7 +187,6 @@
 			if(on && traffic > 0)
 				produce_heat(heatgen)
 				delay = initial(delay)
-				traffic -= netspeed
 
 	proc/produce_heat(heat_amt)
 		if(!(stat & (NOPOWER|BROKEN))) //Blatently stolen from space heater.
@@ -265,9 +266,9 @@
 	use_power = 1
 	idle_power_usage = 50
 	machinetype = 2
-	heatgen = 50
+	heatgen = 20
 	circuitboard = "/obj/item/weapon/circuitboard/telecomms/bus"
-	netspeed = 3
+	netspeed = 40
 
 	receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
 

code/modules/chemical/Chemistry-Machinery.dm

@@ -16,8 +16,11 @@
 	proc
 		recharge()
 			if(stat & BROKEN) return
-			if(energy != max_energy)
-				energy += 4
+			var/addenergy = 4
+			if(energy + addenergy > energy)
+				addenergy = energy - addenergy
+			if(energy < max_energy)
+				energy += addenergy
 				use_power(2000) // This thing uses up alot of power (this is still low as shit for creating reagents from thin air)
 			spawn(200) recharge()