cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp

Browse Source 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/portables_connector.dm
This commit is contained in:
Cheridan
2014-11-13 18:55:53 -06:00
parent 37081d444e 65918a171d
commit 24456bcc22
39 changed files with 807 additions and 1680 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+3 -3
View File
@@ -284,9 +284,9 @@ var/global/pipe_processing_killed = 0
processing_objects -= Object
/datum/controller/game_controller/proc/process_pipenets()
last_thing_processed = /datum/pipe_network
for(var/datum/pipe_network/Network in pipe_networks)
Network.process()
last_thing_processed = /datum/pipeline
for(var/datum/pipeline/P in pipe_networks)
P.process()
/datum/controller/game_controller/proc/process_powernets()
last_thing_processed = /datum/powernet