cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2

Browse Source 
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
This commit is contained in:
duncathan
2015-07-16 04:27:25 -06:00
parent 280373489b 009a53271e
commit ae417d2a03
862 changed files with 4474 additions and 4054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+2 -1
View File
@@ -18,7 +18,7 @@
/*
Iconnery
*/
/obj/machinery/atmospherics/components/binary/hide(var/intact)
/obj/machinery/atmospherics/components/binary/hide(intact)
showpipe = !intact
update_icon()
@@ -32,6 +32,7 @@ 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)