cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 15:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some weird merge issues

Browse Source 
Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
CaelAislinn
2012-05-08 15:43:41 +10:00
parent 08fa9101a7
commit bd86b7236f
13 changed files with 4306 additions and 4633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/defines/obj/machinery.dm
View File

@@ -113,6 +113,7 @@
idle_power_usage = 2
active_power_usage = 6
power_channel = ENVIRON
var/network
New()
if(z == 1)