cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some misplaced set_dir()s

Browse Source 
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
This commit is contained in:
Mloc
2014-12-08 10:09:09 +00:00
parent f34803ac33
commit 83f2a5ba5a
13 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
View File

@@ -1,5 +1,5 @@
obj/machinery/atmospherics/binary obj/machinery/atmospherics/binary
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|NORTH initialize_directions = SOUTH|NORTH
use_power = 1 use_power = 1

2
code/ATMOSPHERICS/components/portables_connector.dm
View File

@@ -5,7 +5,7 @@
name = "Connector Port" name = "Connector Port"
desc = "For connecting portables devices related to atmospherics control." desc = "For connecting portables devices related to atmospherics control."
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
var/obj/machinery/portable_atmospherics/connected_device var/obj/machinery/portable_atmospherics/connected_device

20
code/ATMOSPHERICS/components/trinary_devices/filter.dm
View File

@@ -5,7 +5,7 @@
level = 1 level = 1
name = "Gas filter" name = "Gas filter"
use_power = 1 use_power = 1
idle_power_usage = 150 //internal circuitry, friction losses and stuff 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 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") filtered_out = list("carbon_dioxide")
if(4)//removing N2O if(4)//removing N2O
filtered_out = list("sleeping_agent") filtered_out = list("sleeping_agent")
air1.volume = ATMOS_DEFAULT_VOLUME_FILTER air1.volume = ATMOS_DEFAULT_VOLUME_FILTER
air2.volume = ATMOS_DEFAULT_VOLUME_FILTER air2.volume = ATMOS_DEFAULT_VOLUME_FILTER
air3.volume = ATMOS_DEFAULT_VOLUME_FILTER air3.volume = ATMOS_DEFAULT_VOLUME_FILTER
if(radio_controller) if(radio_controller)
initialize() initialize()
@@ -102,14 +102,14 @@
update_use_power(0) //usually we get here because a player turned a pump off - definitely want to update. update_use_power(0) //usually we get here because a player turned a pump off - definitely want to update.
last_flow_rate = 0 last_flow_rate = 0
return return
//Figure out the amount of moles to transfer //Figure out the amount of moles to transfer
var/transfer_moles = (set_flow_rate/air1.volume)*air1.total_moles var/transfer_moles = (set_flow_rate/air1.volume)*air1.total_moles
var/power_draw = -1 var/power_draw = -1
if (transfer_moles > MINUMUM_MOLES_TO_FILTER) if (transfer_moles > MINUMUM_MOLES_TO_FILTER)
power_draw = filter_gas(src, filtered_out, air1, air2, air3, transfer_moles, active_power_usage) power_draw = filter_gas(src, filtered_out, air1, air2, air3, transfer_moles, active_power_usage)
if(network2) if(network2)
network2.update = 1 network2.update = 1
@@ -125,7 +125,7 @@
last_flow_rate = 0 last_flow_rate = 0
else else
handle_power_draw(power_draw) handle_power_draw(power_draw)
return 1 return 1
/obj/machinery/atmospherics/trinary/filter/initialize() /obj/machinery/atmospherics/trinary/filter/initialize()
@@ -214,7 +214,7 @@
src.add_fingerprint(usr) src.add_fingerprint(usr)
if(href_list["filterset"]) if(href_list["filterset"])
filter_type = text2num(href_list["filterset"]) filter_type = text2num(href_list["filterset"])
filtered_out.Cut() //no need to create new lists unnecessarily filtered_out.Cut() //no need to create new lists unnecessarily
switch(filter_type) switch(filter_type)
if(0) //removing hydrocarbons if(0) //removing hydrocarbons
@@ -228,7 +228,7 @@
filtered_out += "carbon_dioxide" filtered_out += "carbon_dioxide"
if(4)//removing N2O if(4)//removing N2O
filtered_out += "sleeping_agent" filtered_out += "sleeping_agent"
if (href_list["temp"]) if (href_list["temp"])
src.temp = null src.temp = null
if(href_list["set_flow_rate"]) if(href_list["set_flow_rate"])
@@ -248,7 +248,7 @@
/obj/machinery/atmospherics/trinary/filter/m_filter /obj/machinery/atmospherics/trinary/filter/m_filter
icon_state = "mmap" icon_state = "mmap"
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|NORTH|EAST initialize_directions = SOUTH|NORTH|EAST
obj/machinery/atmospherics/trinary/filter/m_filter/New() obj/machinery/atmospherics/trinary/filter/m_filter/New()

18
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
View File

@@ -12,7 +12,7 @@
var/set_flow_rate = ATMOS_DEFAULT_VOLUME_MIXER var/set_flow_rate = ATMOS_DEFAULT_VOLUME_MIXER
var/list/mixing_inputs var/list/mixing_inputs
//for mapping //for mapping
var/node1_concentration = 0.5 var/node1_concentration = 0.5
var/node2_concentration = 0.5 var/node2_concentration = 0.5
@@ -71,23 +71,23 @@
/obj/machinery/atmospherics/trinary/mixer/process() /obj/machinery/atmospherics/trinary/mixer/process()
..() ..()
//For some reason this doesn't work even in initialize(), so it goes here. //For some reason this doesn't work even in initialize(), so it goes here.
if (!mixing_inputs) if (!mixing_inputs)
mixing_inputs = list(src.air1 = node1_concentration, src.air2 = node2_concentration) mixing_inputs = list(src.air1 = node1_concentration, src.air2 = node2_concentration)
if((stat & (NOPOWER|BROKEN)) || !on) if((stat & (NOPOWER|BROKEN)) || !on)
update_use_power(0) //usually we get here because a player turned a pump off - definitely want to update. update_use_power(0) //usually we get here because a player turned a pump off - definitely want to update.
last_flow_rate = 0 last_flow_rate = 0
return return
//Figure out the amount of moles to transfer //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/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 var/power_draw = -1
if (transfer_moles > MINUMUM_MOLES_TO_FILTER) if (transfer_moles > MINUMUM_MOLES_TO_FILTER)
power_draw = mix_gas(src, mixing_inputs, air3, transfer_moles, active_power_usage) power_draw = mix_gas(src, mixing_inputs, air3, transfer_moles, active_power_usage)
if(network1 && mixing_inputs[air1]) if(network1 && mixing_inputs[air1])
network1.update = 1 network1.update = 1
@@ -103,7 +103,7 @@
last_flow_rate = 0 last_flow_rate = 0
else else
handle_power_draw(power_draw) handle_power_draw(power_draw)
return 1 return 1
/obj/machinery/atmospherics/trinary/mixer/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) /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 obj/machinery/atmospherics/trinary/mixer/t_mixer
icon_state = "tmap" icon_state = "tmap"
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|EAST|WEST initialize_directions = SOUTH|EAST|WEST
//node 3 is the outlet, nodes 1 & 2 are intakes //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 obj/machinery/atmospherics/trinary/mixer/m_mixer
icon_state = "mmap" icon_state = "mmap"
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|NORTH|EAST initialize_directions = SOUTH|NORTH|EAST
//node 3 is the outlet, nodes 1 & 2 are intakes //node 3 is the outlet, nodes 1 & 2 are intakes

2
code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
View File

@@ -1,5 +1,5 @@
obj/machinery/atmospherics/trinary obj/machinery/atmospherics/trinary
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|NORTH|WEST initialize_directions = SOUTH|NORTH|WEST
use_power = 1 use_power = 1

2
code/ATMOSPHERICS/components/tvalve.dm
View File

@@ -6,7 +6,7 @@
desc = "A pipe valve" desc = "A pipe valve"
level = 1 level = 1
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|NORTH|WEST initialize_directions = SOUTH|NORTH|WEST
var/state = 0 // 0 = go straight, 1 = go to side var/state = 0 // 0 = go straight, 1 = go to side

2
code/ATMOSPHERICS/components/unary/oxygen_generator.dm
View File

@@ -6,7 +6,7 @@ obj/machinery/atmospherics/unary/oxygen_generator
name = "Oxygen Generator" name = "Oxygen Generator"
desc = "" desc = ""
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
var/on = 0 var/on = 0

2
code/ATMOSPHERICS/components/unary/unary_base.dm
View File

@@ -1,5 +1,5 @@
/obj/machinery/atmospherics/unary /obj/machinery/atmospherics/unary
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
//layer = TURF_LAYER+0.1 //layer = TURF_LAYER+0.1

2
code/ATMOSPHERICS/components/valve.dm
View File

@@ -6,7 +6,7 @@
desc = "A pipe valve" desc = "A pipe valve"
level = 1 level = 1
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|NORTH initialize_directions = SOUTH|NORTH
var/open = 0 var/open = 0

12
code/ATMOSPHERICS/mainspipe.dm
View File

@@ -37,7 +37,7 @@ obj/machinery/atmospherics/mains_pipe
layer = 2.4 //under wires with their 2.5 layer = 2.4 //under wires with their 2.5
force = 20 force = 20
var/volume = 0 var/volume = 0
var/alert_pressure = 80*ONE_ATMOSPHERE var/alert_pressure = 80*ONE_ATMOSPHERE
@@ -115,7 +115,7 @@ obj/machinery/atmospherics/mains_pipe/simple
name = "mains pipe" name = "mains pipe"
desc = "A one meter section of 3-line mains pipe" desc = "A one meter section of 3-line mains pipe"
set_dir(SOUTH) dir = SOUTH
initialize_mains_directions = SOUTH|NORTH initialize_mains_directions = SOUTH|NORTH
New() New()
@@ -196,7 +196,7 @@ obj/machinery/atmospherics/mains_pipe/manifold
name = "manifold pipe" name = "manifold pipe"
desc = "A manifold composed of mains pipes" desc = "A manifold composed of mains pipes"
set_dir(SOUTH) dir = SOUTH
initialize_mains_directions = EAST|NORTH|WEST initialize_mains_directions = EAST|NORTH|WEST
volume = 105 volume = 105
@@ -261,7 +261,7 @@ obj/machinery/atmospherics/mains_pipe/manifold4w
name = "manifold pipe" name = "manifold pipe"
desc = "A manifold composed of mains pipes" desc = "A manifold composed of mains pipes"
set_dir(SOUTH) dir = SOUTH
initialize_mains_directions = EAST|NORTH|WEST|SOUTH initialize_mains_directions = EAST|NORTH|WEST|SOUTH
volume = 105 volume = 105
@@ -504,7 +504,7 @@ obj/machinery/atmospherics/mains_pipe/cap
name = "pipe cap" name = "pipe cap"
desc = "A cap for the end of a mains pipe" desc = "A cap for the end of a mains pipe"
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
volume = 35 volume = 35
@@ -546,7 +546,7 @@ obj/machinery/atmospherics/mains_pipe/valve
var/open = 1 var/open = 1
set_dir(SOUTH) dir = SOUTH
initialize_mains_directions = SOUTH|NORTH initialize_mains_directions = SOUTH|NORTH
New() New()

12
code/ATMOSPHERICS/pipes.dm
View File

@@ -143,7 +143,7 @@
volume = ATMOS_DEFAULT_VOLUME_PIPE volume = ATMOS_DEFAULT_VOLUME_PIPE
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH|NORTH initialize_directions = SOUTH|NORTH
var/obj/machinery/atmospherics/node1 var/obj/machinery/atmospherics/node1
@@ -406,7 +406,7 @@
volume = ATMOS_DEFAULT_VOLUME_PIPE * 1.5 volume = ATMOS_DEFAULT_VOLUME_PIPE * 1.5
set_dir(SOUTH) dir = SOUTH
initialize_directions = EAST|NORTH|WEST initialize_directions = EAST|NORTH|WEST
var/obj/machinery/atmospherics/node1 var/obj/machinery/atmospherics/node1
@@ -658,7 +658,7 @@
volume = ATMOS_DEFAULT_VOLUME_PIPE * 2 volume = ATMOS_DEFAULT_VOLUME_PIPE * 2
set_dir(SOUTH) dir = SOUTH
initialize_directions = NORTH|SOUTH|EAST|WEST initialize_directions = NORTH|SOUTH|EAST|WEST
var/obj/machinery/atmospherics/node1 var/obj/machinery/atmospherics/node1
@@ -918,7 +918,7 @@
volume = 35 volume = 35
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
var/obj/machinery/atmospherics/node var/obj/machinery/atmospherics/node
@@ -1042,7 +1042,7 @@
var/start_pressure = 25*ONE_ATMOSPHERE var/start_pressure = 25*ONE_ATMOSPHERE
level = 1 level = 1
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
density = 1 density = 1
@@ -1220,7 +1220,7 @@
volume = 250 volume = 250
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
var/build_killswitch = 1 var/build_killswitch = 1

2
code/TriDimension/Pipes.dm
View File

@@ -10,7 +10,7 @@ obj/machinery/atmospherics/pipe/zpipe
volume = 70 volume = 70
set_dir(SOUTH) dir = SOUTH
initialize_directions = SOUTH initialize_directions = SOUTH
var/obj/machinery/atmospherics/node1 //connection on the same Z var/obj/machinery/atmospherics/node1 //connection on the same Z

2
code/game/machinery/doors/door.dm
View File

@@ -29,7 +29,7 @@
var/hitsound = 'sound/weapons/smash.ogg' //sound door makes when hit with a weapon var/hitsound = 'sound/weapons/smash.ogg' //sound door makes when hit with a weapon
//Multi-tile doors //Multi-tile doors
set_dir(EAST) dir = EAST
var/width = 1 var/width = 1
/obj/machinery/door/New() /obj/machinery/door/New()