From 0fd70f03cccf487d30e13cd664e7974bfbf279b8 Mon Sep 17 00:00:00 2001 From: MrStonedOne Date: Wed, 29 Apr 2015 02:24:07 -0700 Subject: [PATCH] Fixes a minor goof in powernets from fixing merge conflicts --- code/modules/power/powernet.dm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index e811ffeafc8..ac2b5ea3985 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -1,7 +1,17 @@ //////////////////////////////////////////// -// POWERNET DATUM PROCS +// POWERNET DATUM // each contiguous network of cables & nodes -//////////////////////////////////////////// +///////////////////////////////////// +/datum/powernet + var/list/cables = list() // all cables & junctions + var/list/nodes = list() // all connected machines + + var/load = 0 // the current load on the powernet, increased by each machine at processing + var/newavail = 0 // what available power was gathered last tick, then becomes... + var/avail = 0 //...the current available power in the powernet + var/viewload = 0 // the load as it appears on the power console (gradually updated) + var/number = 0 // Unused //TODEL + var/netexcess = 0 // excess power on the powernet (typically avail-load)/////// /datum/powernet/New() SSpower.powernets += src