From 83f2a5ba5a03e975fe49bc9b372133c09e655b5a Mon Sep 17 00:00:00 2001 From: Mloc Date: Mon, 8 Dec 2014 10:09:09 +0000 Subject: [PATCH] fix some misplaced set_dir()s fixes part of #7284 fixes #7288 fixes one of #7287 Signed-off-by: Mloc --- .../binary_devices/binary_atmos_base.dm | 2 +- .../components/portables_connector.dm | 2 +- .../components/trinary_devices/filter.dm | 20 +++++++++---------- .../components/trinary_devices/mixer.dm | 18 ++++++++--------- .../trinary_devices/trinary_base.dm | 2 +- code/ATMOSPHERICS/components/tvalve.dm | 2 +- .../components/unary/oxygen_generator.dm | 2 +- .../components/unary/unary_base.dm | 2 +- code/ATMOSPHERICS/components/valve.dm | 2 +- code/ATMOSPHERICS/mainspipe.dm | 12 +++++------ code/ATMOSPHERICS/pipes.dm | 12 +++++------ code/TriDimension/Pipes.dm | 2 +- code/game/machinery/doors/door.dm | 2 +- 13 files changed, 40 insertions(+), 40 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm index aed8b2dc07..649972297a 100644 --- a/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm +++ b/code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm @@ -1,5 +1,5 @@ obj/machinery/atmospherics/binary - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH use_power = 1 diff --git a/code/ATMOSPHERICS/components/portables_connector.dm b/code/ATMOSPHERICS/components/portables_connector.dm index 488c1eeb91..4bfd61a0a2 100644 --- a/code/ATMOSPHERICS/components/portables_connector.dm +++ b/code/ATMOSPHERICS/components/portables_connector.dm @@ -5,7 +5,7 @@ name = "Connector Port" desc = "For connecting portables devices related to atmospherics control." - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH var/obj/machinery/portable_atmospherics/connected_device diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 4f5205687e..145a1d6108 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -5,7 +5,7 @@ level = 1 name = "Gas filter" - + use_power = 1 idle_power_usage = 150 //internal circuitry, friction losses and stuff active_power_usage = 7500 //This also doubles as a measure of how powerful the filter is, in Watts. 7500 W ~ 10 HP @@ -49,11 +49,11 @@ filtered_out = list("carbon_dioxide") if(4)//removing N2O filtered_out = list("sleeping_agent") - + air1.volume = ATMOS_DEFAULT_VOLUME_FILTER air2.volume = ATMOS_DEFAULT_VOLUME_FILTER air3.volume = ATMOS_DEFAULT_VOLUME_FILTER - + if(radio_controller) initialize() @@ -102,14 +102,14 @@ update_use_power(0) //usually we get here because a player turned a pump off - definitely want to update. last_flow_rate = 0 return - + //Figure out the amount of moles to transfer var/transfer_moles = (set_flow_rate/air1.volume)*air1.total_moles - + var/power_draw = -1 if (transfer_moles > MINUMUM_MOLES_TO_FILTER) power_draw = filter_gas(src, filtered_out, air1, air2, air3, transfer_moles, active_power_usage) - + if(network2) network2.update = 1 @@ -125,7 +125,7 @@ last_flow_rate = 0 else handle_power_draw(power_draw) - + return 1 /obj/machinery/atmospherics/trinary/filter/initialize() @@ -214,7 +214,7 @@ src.add_fingerprint(usr) if(href_list["filterset"]) filter_type = text2num(href_list["filterset"]) - + filtered_out.Cut() //no need to create new lists unnecessarily switch(filter_type) if(0) //removing hydrocarbons @@ -228,7 +228,7 @@ filtered_out += "carbon_dioxide" if(4)//removing N2O filtered_out += "sleeping_agent" - + if (href_list["temp"]) src.temp = null if(href_list["set_flow_rate"]) @@ -248,7 +248,7 @@ /obj/machinery/atmospherics/trinary/filter/m_filter icon_state = "mmap" - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH|EAST obj/machinery/atmospherics/trinary/filter/m_filter/New() diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 9432518b53..c63c6208d3 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -12,7 +12,7 @@ var/set_flow_rate = ATMOS_DEFAULT_VOLUME_MIXER var/list/mixing_inputs - + //for mapping var/node1_concentration = 0.5 var/node2_concentration = 0.5 @@ -71,23 +71,23 @@ /obj/machinery/atmospherics/trinary/mixer/process() ..() - + //For some reason this doesn't work even in initialize(), so it goes here. if (!mixing_inputs) mixing_inputs = list(src.air1 = node1_concentration, src.air2 = node2_concentration) - + if((stat & (NOPOWER|BROKEN)) || !on) update_use_power(0) //usually we get here because a player turned a pump off - definitely want to update. last_flow_rate = 0 return - + //Figure out the amount of moles to transfer var/transfer_moles = (set_flow_rate*mixing_inputs[air1]/air1.volume)*air1.total_moles + (set_flow_rate*mixing_inputs[air1]/air2.volume)*air2.total_moles - + var/power_draw = -1 if (transfer_moles > MINUMUM_MOLES_TO_FILTER) power_draw = mix_gas(src, mixing_inputs, air3, transfer_moles, active_power_usage) - + if(network1 && mixing_inputs[air1]) network1.update = 1 @@ -103,7 +103,7 @@ last_flow_rate = 0 else handle_power_draw(power_draw) - + return 1 /obj/machinery/atmospherics/trinary/mixer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) @@ -181,7 +181,7 @@ obj/machinery/atmospherics/trinary/mixer/t_mixer icon_state = "tmap" - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|EAST|WEST //node 3 is the outlet, nodes 1 & 2 are intakes @@ -227,7 +227,7 @@ obj/machinery/atmospherics/trinary/mixer/t_mixer/initialize() obj/machinery/atmospherics/trinary/mixer/m_mixer icon_state = "mmap" - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH|EAST //node 3 is the outlet, nodes 1 & 2 are intakes diff --git a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm index ce3aafc953..822c9a4d6d 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm @@ -1,5 +1,5 @@ obj/machinery/atmospherics/trinary - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH|WEST use_power = 1 diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 4d931bd324..39ca1e25fd 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -6,7 +6,7 @@ desc = "A pipe valve" level = 1 - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH|WEST var/state = 0 // 0 = go straight, 1 = go to side diff --git a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm index c3ccdbc574..14bbb46bba 100644 --- a/code/ATMOSPHERICS/components/unary/oxygen_generator.dm +++ b/code/ATMOSPHERICS/components/unary/oxygen_generator.dm @@ -6,7 +6,7 @@ obj/machinery/atmospherics/unary/oxygen_generator name = "Oxygen Generator" desc = "" - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH var/on = 0 diff --git a/code/ATMOSPHERICS/components/unary/unary_base.dm b/code/ATMOSPHERICS/components/unary/unary_base.dm index 8d850cc74f..8af26e51eb 100644 --- a/code/ATMOSPHERICS/components/unary/unary_base.dm +++ b/code/ATMOSPHERICS/components/unary/unary_base.dm @@ -1,5 +1,5 @@ /obj/machinery/atmospherics/unary - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH //layer = TURF_LAYER+0.1 diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 4633c06511..aa6ac1bf11 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -6,7 +6,7 @@ desc = "A pipe valve" level = 1 - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH var/open = 0 diff --git a/code/ATMOSPHERICS/mainspipe.dm b/code/ATMOSPHERICS/mainspipe.dm index ce23f7bfba..d70d2bc53e 100644 --- a/code/ATMOSPHERICS/mainspipe.dm +++ b/code/ATMOSPHERICS/mainspipe.dm @@ -37,7 +37,7 @@ obj/machinery/atmospherics/mains_pipe layer = 2.4 //under wires with their 2.5 force = 20 - + var/volume = 0 var/alert_pressure = 80*ONE_ATMOSPHERE @@ -115,7 +115,7 @@ obj/machinery/atmospherics/mains_pipe/simple name = "mains pipe" desc = "A one meter section of 3-line mains pipe" - set_dir(SOUTH) + dir = SOUTH initialize_mains_directions = SOUTH|NORTH New() @@ -196,7 +196,7 @@ obj/machinery/atmospherics/mains_pipe/manifold name = "manifold pipe" desc = "A manifold composed of mains pipes" - set_dir(SOUTH) + dir = SOUTH initialize_mains_directions = EAST|NORTH|WEST volume = 105 @@ -261,7 +261,7 @@ obj/machinery/atmospherics/mains_pipe/manifold4w name = "manifold pipe" desc = "A manifold composed of mains pipes" - set_dir(SOUTH) + dir = SOUTH initialize_mains_directions = EAST|NORTH|WEST|SOUTH volume = 105 @@ -504,7 +504,7 @@ obj/machinery/atmospherics/mains_pipe/cap name = "pipe cap" desc = "A cap for the end of a mains pipe" - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH volume = 35 @@ -546,7 +546,7 @@ obj/machinery/atmospherics/mains_pipe/valve var/open = 1 - set_dir(SOUTH) + dir = SOUTH initialize_mains_directions = SOUTH|NORTH New() diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm index 037d39218a..34ece52777 100644 --- a/code/ATMOSPHERICS/pipes.dm +++ b/code/ATMOSPHERICS/pipes.dm @@ -143,7 +143,7 @@ volume = ATMOS_DEFAULT_VOLUME_PIPE - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH|NORTH var/obj/machinery/atmospherics/node1 @@ -406,7 +406,7 @@ volume = ATMOS_DEFAULT_VOLUME_PIPE * 1.5 - set_dir(SOUTH) + dir = SOUTH initialize_directions = EAST|NORTH|WEST var/obj/machinery/atmospherics/node1 @@ -658,7 +658,7 @@ volume = ATMOS_DEFAULT_VOLUME_PIPE * 2 - set_dir(SOUTH) + dir = SOUTH initialize_directions = NORTH|SOUTH|EAST|WEST var/obj/machinery/atmospherics/node1 @@ -918,7 +918,7 @@ volume = 35 - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH var/obj/machinery/atmospherics/node @@ -1042,7 +1042,7 @@ var/start_pressure = 25*ONE_ATMOSPHERE level = 1 - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH density = 1 @@ -1220,7 +1220,7 @@ volume = 250 - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH var/build_killswitch = 1 diff --git a/code/TriDimension/Pipes.dm b/code/TriDimension/Pipes.dm index 4f38444e98..776716f567 100644 --- a/code/TriDimension/Pipes.dm +++ b/code/TriDimension/Pipes.dm @@ -10,7 +10,7 @@ obj/machinery/atmospherics/pipe/zpipe volume = 70 - set_dir(SOUTH) + dir = SOUTH initialize_directions = SOUTH var/obj/machinery/atmospherics/node1 //connection on the same Z diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 80c64acf33..bc8719060f 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -29,7 +29,7 @@ var/hitsound = 'sound/weapons/smash.ogg' //sound door makes when hit with a weapon //Multi-tile doors - set_dir(EAST) + dir = EAST var/width = 1 /obj/machinery/door/New()