From 4e971a7e57fd3b4d8dcc88384dceb210d7ee114d Mon Sep 17 00:00:00 2001 From: MrStonedOne Date: Sat, 25 Jul 2015 23:08:02 -0700 Subject: [PATCH] Moves build_network to air's initialize, Removes initialize() from atmos machinery --- code/ATMOSPHERICS/atmospherics.dm | 7 ------- .../components/binary_devices/dp_vent_pump.dm | 3 --- .../components/unary_devices/outlet_injector.dm | 6 +----- code/ATMOSPHERICS/components/unary_devices/unary_base.dm | 2 -- code/ATMOSPHERICS/components/unary_devices/vent_pump.dm | 8 +------- .../components/unary_devices/vent_scrubber.dm | 9 +-------- code/controllers/subsystem/air.dm | 9 +++++++++ 7 files changed, 12 insertions(+), 32 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 55c3a043756..7ceb4c975c9 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -50,11 +50,6 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/proc/atmosinit() return -//object initializion. done well after air is setup (build_network needs all pipes to be init'ed with atmosinit before hand) -/obj/machinery/atmospherics/initialize() - ..() - build_network() //make sure to build our pipe nets - /obj/machinery/atmospherics/proc/SetInitDirections() return @@ -177,11 +172,9 @@ Pipelines + Other Objects -> Pipe network var/turf/T = loc level = T.intact ? 2 : 1 atmosinit() - initialize() var/list/nodes = pipeline_expansion() for(var/obj/machinery/atmospherics/A in nodes) A.atmosinit() - A.initialize() A.addMember(src) build_network() diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 0064bad9fe5..9cecf78413f 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -149,9 +149,6 @@ Acts like a normal vent, but has an input AND output. ..() if(frequency) set_frequency(frequency) - -/obj/machinery/atmospherics/components/binary/dp_vent_pump/initialize() - ..() broadcast_status() /obj/machinery/atmospherics/components/binary/dp_vent_pump/receive_signal(datum/signal/signal) diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index ca0cf4d90ac..10ecdf726d9 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -107,12 +107,8 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/atmosinit() set_frequency(frequency) - ..() - -/obj/machinery/atmospherics/components/unary/outlet_injector/initialize() - ..() broadcast_status() - + ..() /obj/machinery/atmospherics/components/unary/outlet_injector/receive_signal(datum/signal/signal) if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) diff --git a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm index 1461c1e0c6a..96b99f52fd1 100644 --- a/code/ATMOSPHERICS/components/unary_devices/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary_devices/unary_base.dm @@ -38,10 +38,8 @@ Housekeeping and pipe network stuff below nullifyPipenet(parents[PARENT1]) atmosinit() node = nodes[NODE1] - initialize() if(node) node.atmosinit() - node.initialize() node.addMember(src) build_network() . = 1 \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 808ba4416c2..7d574f302d6 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -55,10 +55,6 @@ if (!id_tag) assign_uid() id_tag = num2text(uid) - if(ticker && ticker.current_state == 3)//if the game is running - src.atmosinit() - src.initialize() - src.broadcast_status() /obj/machinery/atmospherics/components/unary/vent_pump/Destroy() if(radio_controller) @@ -193,10 +189,8 @@ radio_filter_out = frequency==1439?(RADIO_TO_AIRALARM):null if(frequency) set_frequency(frequency) - ..() -/obj/machinery/atmospherics/components/unary/vent_pump/initialize() - ..() broadcast_status() + ..() /obj/machinery/atmospherics/components/unary/vent_pump/receive_signal(datum/signal/signal) if(stat & (NOPOWER|BROKEN)) diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index d568bd297f7..691835ed4cc 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -44,10 +44,6 @@ if (!id_tag) assign_uid() id_tag = num2text(uid) - if(ticker && ticker.current_state == 3)//if the game is running - src.atmosinit() - src.initialize() - src.broadcast_status() /obj/machinery/atmospherics/components/unary/vent_scrubber/Destroy() if(radio_controller) @@ -138,12 +134,9 @@ radio_filter_out = frequency==initial(frequency)?(RADIO_TO_AIRALARM):null if (frequency) set_frequency(frequency) + broadcast_status() check_turfs() ..() -/obj/machinery/atmospherics/components/unary/vent_scrubber/initialize() - ..() - broadcast_status() - /obj/machinery/atmospherics/components/unary/vent_scrubber/process_atmos() ..() diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index ec3a53d1647..45815232804 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -203,3 +203,12 @@ var/datum/subsystem/air/SSair if (z_level && AM.z != z_level) continue AM.atmosinit() + +//this can't be done with setup_atmos_machinery() because +// all atmos machinery has to initalize before the first +// pipenet can be built. +/datum/subsystem/air/proc/setup_pipenets(z_level) + for (var/obj/machinery/atmospherics/AM in atmos_machinery) + if (z_level && AM.z != z_level) + continue + AM.build_network() \ No newline at end of file