cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Large merge resultion. Used remote for map conflicts.

Browse Source
This commit is contained in:
Zuhayr
2014-09-23 21:41:54 +09:30
parent c529e014a7 29c29cd408
commit 0c83a95b90
164 changed files with 8010 additions and 7210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/master_controller.dm
View File

@@ -307,6 +307,7 @@ datum/controller/game_controller/proc/process_machines_power()
var/area/A = active_areas[i]
if(A.powerupdate && A.master == A)
A.powerupdate -= 1
A.clear_usage()
for(var/j = 1; j <= A.related.len; j++)
var/area/SubArea = A.related[j]
for(var/obj/machinery/M in SubArea)
@@ -362,7 +363,7 @@ datum/controller/game_controller/proc/process_powernets()
while(i<=powernets.len)
var/datum/powernet/Powernet = powernets[i]
if(Powernet)
Powernet.reset()
Powernet.process()
i++
continue
powernets.Cut(i,i+1)