Moves build_network to air's initialize, Removes initialize() from atmos machinery

This commit is contained in:
MrStonedOne
2015-07-25 23:08:02 -07:00
parent d38cfcb4ec
commit 4e971a7e57
7 changed files with 12 additions and 32 deletions
-7
View File
@@ -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()
@@ -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)
@@ -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"))
@@ -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
@@ -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))
@@ -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()
..()