Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

This commit is contained in:
Erthilo
2012-05-08 18:28:05 +01:00
28 changed files with 4638 additions and 4818 deletions
+1
View File
@@ -113,6 +113,7 @@
idle_power_usage = 2
active_power_usage = 6
power_channel = ENVIRON
var/network
New()
if(z == 1)