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

Conflicts:
	code/ATMOSPHERICS/components/components_base.dm
This commit is contained in:
duncathan
2015-08-17 16:19:22 -06:00
3 changed files with 11 additions and 8 deletions
@@ -19,7 +19,6 @@
Iconnery
*/
/obj/machinery/atmospherics/components/binary/hide(intact)
showpipe = !intact
update_icon()
..(intact)