merge conflicts

This commit is contained in:
duncathan
2015-07-16 04:54:11 -06:00
parent ae417d2a03
commit 8c2519e115
10 changed files with 31 additions and 74 deletions
@@ -32,7 +32,6 @@ Housekeeping and pipe network stuff
var/node2_connect = dir
var/node1_connect = turn(dir, 180)
/obj/machinery/atmospherics/binary/unsafe_pressure_release(mob/user,pressures)
var/list/node_connects = new/list()
node_connects.Add(node1_connect, node2_connect)
..(node_connects)