cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7916 from GinjaNinja32/runtime

Browse Source 
Fixes power runtime
This commit is contained in:
PsiOmegaDelta
2015-01-22 17:47:05 +01:00
parent 693c77745c c97b54fe56
commit 4ebd54f0af
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/power/power.dm
View File

@@ -294,6 +294,8 @@
for(var/obj/structure/cable/Cable in net2.cables) //merge cables for(var/obj/structure/cable/Cable in net2.cables) //merge cables
net1.add_cable(Cable) net1.add_cable(Cable)
if(!net2) return net1
for(var/obj/machinery/power/Node in net2.nodes) //merge power machines for(var/obj/machinery/power/Node in net2.nodes) //merge power machines
if(!Node.connect_to_network()) if(!Node.connect_to_network())
Node.disconnect_from_network() //if somehow we can't connect the machine to the new powernet, disconnect it from the old nonetheless Node.disconnect_from_network() //if somehow we can't connect the machine to the new powernet, disconnect it from the old nonetheless