Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/atmospherics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Pipelines + Other Objects -> Pipe network
var/obj/machinery/atmospherics/node1
var/obj/machinery/atmospherics/node2

/obj/machinery/atmospherics/New()
/obj/machinery/atmospherics/Initialize(mapload, ...)
if(!icon_manager)
icon_manager = new()

Expand All @@ -44,7 +44,7 @@ Pipelines + Other Objects -> Pipe network
if(!pipe_color_check(pipe_color))
pipe_color = null
GLOB.atmos_machinery += src
..()
. = ..()

/obj/machinery/atmospherics/Destroy()
GLOB.atmos_machinery -= src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
var/datum/pipe_network/network1
var/datum/pipe_network/network2

/obj/machinery/atmospherics/binary/New()
..()
/obj/machinery/atmospherics/binary/Initialize(mapload, ...)
. = ..()
switch(dir)
if(NORTH)
initialize_directions = NORTH|SOUTH
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/circulator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
var/stored_energy = 0
var/temperature_overlay

/obj/machinery/atmospherics/binary/circulator/New()
..()
/obj/machinery/atmospherics/binary/circulator/Initialize(mapload, ...)
. = ..()
desc = initial(desc) + " Its outlet port is to the [dir2text(dir)]."
air1.volume = 400

Expand Down
8 changes: 4 additions & 4 deletions code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
//2: Do not pass input_pressure_min
//4: Do not pass output_pressure_max

/obj/machinery/atmospherics/binary/dp_vent_pump/New()
..()
/obj/machinery/atmospherics/binary/dp_vent_pump/Initialize(mapload, ...)
. = ..()
air1.volume = ATMOS_DEFAULT_VOLUME_PUMP
air2.volume = ATMOS_DEFAULT_VOLUME_PUMP
icon = null

/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume
name = "Large Dual Port Air Vent"

/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/New()
..()
/obj/machinery/atmospherics/binary/dp_vent_pump/high_volume/Initialize(mapload, ...)
. = ..()
air1.volume = ATMOS_DEFAULT_VOLUME_PUMP + 800
air2.volume = ATMOS_DEFAULT_VOLUME_PUMP + 800

Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
var/id
var/datum/radio_frequency/radio_connection

/obj/machinery/atmospherics/binary/passive_gate/New()
..()
/obj/machinery/atmospherics/binary/passive_gate/Initialize(mapload, ...)
. = ..()
air1.volume = ATMOS_DEFAULT_VOLUME_PUMP * 2.5
air2.volume = ATMOS_DEFAULT_VOLUME_PUMP * 2.5

Expand Down
8 changes: 4 additions & 4 deletions code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
var/datum/pipe_network/network1
var/datum/pipe_network/network2

/obj/machinery/atmospherics/pipeturbine/New()
..()
/obj/machinery/atmospherics/pipeturbine/Initialize(mapload, ...)
. = ..()
air_in.volume = 200
air_out.volume = 800
volume_ratio = air_in.volume / (air_in.volume + air_out.volume)
Expand Down Expand Up @@ -228,8 +228,8 @@
var/kin_to_el_ratio = 0.1 //How much kinetic energy will be taken from turbine and converted into electricity
var/obj/machinery/atmospherics/pipeturbine/turbine

/obj/machinery/power/turbinemotor/New()
..()
/obj/machinery/power/turbinemotor/Initialize(mapload, ...)
. = ..()
spawn(1)
updateConnection()

Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ Thus, the two variables affect pump operation are set in New():
var/id
var/datum/radio_frequency/radio_connection

/obj/machinery/atmospherics/binary/pump/New()
..()
/obj/machinery/atmospherics/binary/pump/Initialize(mapload, ...)
. = ..()
air1.volume = ATMOS_DEFAULT_VOLUME_PUMP
air2.volume = ATMOS_DEFAULT_VOLUME_PUMP

Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/omni_devices/filter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

var/list/filtering_outputs = list() //maps gasids to gas_mixtures

/obj/machinery/atmospherics/omni/filter/New()
..()
/obj/machinery/atmospherics/omni/filter/Initialize(mapload, ...)
. = ..()
rebuild_filtering_list()
for(var/datum/omni_port/P in ports)
P.air.volume = ATMOS_DEFAULT_VOLUME_FILTER
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/omni_devices/mixer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

var/list/mixing_inputs = list()

/obj/machinery/atmospherics/omni/mixer/New()
..()
/obj/machinery/atmospherics/omni/mixer/Initialize(mapload, ...)
. = ..()
if(mapper_set())
var/con = 0
for(var/datum/omni_port/P in ports)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/omni_devices/omni_base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

var/list/ports = new()

/obj/machinery/atmospherics/omni/New()
..()
/obj/machinery/atmospherics/omni/Initialize(mapload, ...)
. = ..()
icon_state = "base"

ports = new()
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/portables_connector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
layer = GAS_FILTER_LAYER


/obj/machinery/atmospherics/portables_connector/New()
/obj/machinery/atmospherics/portables_connector/Initialize(mapload, ...)
initialize_directions = dir
..()
. = ..()

/obj/machinery/atmospherics/portables_connector/update_icon()
icon_state = "connector"
Expand Down
8 changes: 4 additions & 4 deletions code/ATMOSPHERICS/components/trinary_devices/filter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
if(frequency)
radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA)

/obj/machinery/atmospherics/trinary/filter/New()
..()
/obj/machinery/atmospherics/trinary/filter/Initialize(mapload, ...)
. = ..()
switch(filter_type)
if(0) //removing hydrocarbons
filtered_out = list("plasma")
Expand Down Expand Up @@ -236,8 +236,8 @@
dir = SOUTH
initialize_directions = SOUTH|NORTH|EAST

/obj/machinery/atmospherics/trinary/filter/m_filter/New()
..()
/obj/machinery/atmospherics/trinary/filter/m_filter/Initialize(mapload, ...)
. = ..()
switch(dir)
if(NORTH)
initialize_directions = WEST|NORTH|SOUTH
Expand Down
12 changes: 6 additions & 6 deletions code/ATMOSPHERICS/components/trinary_devices/mixer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
if(old_stat != stat)
update_icon()

/obj/machinery/atmospherics/trinary/mixer/New()
..()
/obj/machinery/atmospherics/trinary/mixer/Initialize(mapload, ...)
. = ..()
air1.volume = ATMOS_DEFAULT_VOLUME_MIXER
air2.volume = ATMOS_DEFAULT_VOLUME_MIXER
air3.volume = ATMOS_DEFAULT_VOLUME_MIXER * 1.5
Expand Down Expand Up @@ -182,8 +182,8 @@

//node 3 is the outlet, nodes 1 & 2 are intakes

/obj/machinery/atmospherics/trinary/mixer/t_mixer/New()
..()
/obj/machinery/atmospherics/trinary/mixer/t_mixer/Initialize(mapload, ...)
. = ..()
switch(dir)
if(NORTH)
initialize_directions = EAST|NORTH|WEST
Expand Down Expand Up @@ -228,8 +228,8 @@

//node 3 is the outlet, nodes 1 & 2 are intakes

/obj/machinery/atmospherics/trinary/mixer/m_mixer/New()
..()
/obj/machinery/atmospherics/trinary/mixer/m_mixer/Initialize(mapload, ...)
. = ..()
switch(dir)
if(NORTH)
initialize_directions = WEST|NORTH|SOUTH
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
var/datum/pipe_network/network2
var/datum/pipe_network/network3

/obj/machinery/atmospherics/trinary/New()
..()
/obj/machinery/atmospherics/trinary/Initialize(mapload, ...)
. = ..()
switch(dir)
if(NORTH)
initialize_directions = EAST|NORTH|SOUTH
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/tvalve.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
/obj/machinery/atmospherics/tvalve/hide(i)
update_underlays()

/obj/machinery/atmospherics/tvalve/New()
/obj/machinery/atmospherics/tvalve/Initialize(mapload, ...)
initialize_directions()
..()
. = ..()

/obj/machinery/atmospherics/tvalve/proc/initialize_directions()
switch(dir)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/cold_sink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
var/set_temperature = T20C // Thermostat
var/cooling = 0

/obj/machinery/atmospherics/unary/freezer/New()
/obj/machinery/atmospherics/unary/freezer/Initialize(mapload, ...)
initialize_directions = dir
..()
. = ..()

/obj/machinery/atmospherics/unary/freezer/atmos_init()
if(node1)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/heat_source.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
var/set_temperature = T20C //thermostat
var/heating = 0 //mainly for icon updates

/obj/machinery/atmospherics/unary/heater/New()
/obj/machinery/atmospherics/unary/heater/Initialize(mapload, ...)
initialize_directions = dir
..()
. = ..()

/obj/machinery/atmospherics/unary/heater/atmos_init()
if(node1)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/outlet_injector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
level = BELOW_PLATING_LEVEL
layer = GAS_SCRUBBER_LAYER

/obj/machinery/atmospherics/unary/outlet_injector/New()
..()
/obj/machinery/atmospherics/unary/outlet_injector/Initialize(mapload, ...)
. = ..()
air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 500 //Give it a small reservoir for injecting. Also allows it to have a higher flow rate limit than vent pumps, to differentiate injectors a bit more.

/obj/machinery/atmospherics/unary/outlet_injector/update_icon()
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/oxygen_generator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

return

/obj/machinery/atmospherics/unary/oxygen_generator/New()
..()
/obj/machinery/atmospherics/unary/oxygen_generator/Initialize(mapload, ...)
. = ..()

air_contents.volume = 50

Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/unary_base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

var/datum/pipe_network/network

/obj/machinery/atmospherics/unary/New()
..()
/obj/machinery/atmospherics/unary/Initialize(mapload, ...)
. = ..()
initialize_directions = dir
air_contents = new

Expand Down
12 changes: 6 additions & 6 deletions code/ATMOSPHERICS/components/unary/vent_pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
pressure_checks = 1
pressure_checks_default = 1

/obj/machinery/atmospherics/unary/vent_pump/New()
..()
/obj/machinery/atmospherics/unary/vent_pump/Initialize(mapload, ...)
. = ..()
air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP * 2

initial_loc = get_area(loc)
Expand All @@ -95,17 +95,17 @@
power_channel = STATIC_EQUIP
power_rating = 15000 //15 kW ~ 20 HP

/obj/machinery/atmospherics/unary/vent_pump/high_volume/New()
..()
/obj/machinery/atmospherics/unary/vent_pump/high_volume/Initialize(mapload, ...)
. = ..()
air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 800

/obj/machinery/atmospherics/unary/vent_pump/engine
name = "Engine Core Vent"
power_channel = STATIC_ENVIRON
power_rating = 30000 //15 kW ~ 20 HP

/obj/machinery/atmospherics/unary/vent_pump/engine/New()
..()
/obj/machinery/atmospherics/unary/vent_pump/engine/Initialize(mapload, ...)
. = ..()
air_contents.volume = ATMOS_DEFAULT_VOLUME_PUMP + 500 //meant to match air injector

/obj/machinery/atmospherics/unary/vent_pump/update_icon(safety = 0)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/vent_scrubber.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
use_power = IDLE_POWER_USE
icon_state = "map_scrubber_on"

/obj/machinery/atmospherics/unary/vent_scrubber/New()
..()
/obj/machinery/atmospherics/unary/vent_scrubber/Initialize(mapload, ...)
. = ..()
air_contents.volume = ATMOS_DEFAULT_VOLUME_FILTER * 2

initial_loc = get_area(loc)
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/valve.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
/obj/machinery/atmospherics/valve/hide(i)
update_underlays()

/obj/machinery/atmospherics/valve/New()
/obj/machinery/atmospherics/valve/Initialize(mapload, ...)
switch(dir)
if(NORTH, SOUTH)
initialize_directions = NORTH|SOUTH
if(EAST, WEST)
initialize_directions = EAST|WEST
..()
. = ..()

/obj/machinery/atmospherics/valve/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference)
if(reference == node1)
Expand Down
8 changes: 4 additions & 4 deletions code/ATMOSPHERICS/he_pipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
buckle_lying = 1

// BubbleWrap
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/New()
..()
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/Initialize(mapload, ...)
. = ..()
initialize_directions_he = initialize_directions // The auto-detection from /pipe is good enough for a simple HE pipe
// BubbleWrap END
color = "#404040" //we don't make use of the fancy overlay system for colours, use this to set the default.
Expand Down Expand Up @@ -113,8 +113,8 @@
minimum_temperature_difference = 300

// BubbleWrap
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/New()
.. ()
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/Initialize(mapload, ...)
. = ..()
switch ( dir )
if ( SOUTH )
initialize_directions = NORTH
Expand Down
Loading
Loading