Rob Nelson 567c287b84 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into beams ...

Conflicts:
	code/game/machinery/pipe/construction.dm

2014-12-11 14:10:59 -08:00

..

cap.dm

Add missing file

2014-06-10 14:16:20 -07:00

cold_sink.dm

Made heaters only heat, and freezers only freeze.

2014-12-05 20:13:26 +00:00

generator_input.dm

…

heat_exchanger.dm

…

heat_source.dm

Made heaters only heat, and freezers only freeze.

2014-12-05 20:13:26 +00:00

outlet_injector.dm

Configurable gas sensors, tank monitors, AACs. Cleaned up multitool API.

2014-06-10 22:23:18 -07:00

oxygen_generator.dm

…

thermal_plate.dm

Well, HE pipes leak like a sieve, so this is on hold for now.

2014-11-21 11:57:17 -08:00

unary_base.dm

Fix destroys() not calling parent, tweak qdel to use one loop only.

2014-06-14 15:26:29 -08:00

vent_pump.dm

AAC improvements/fixes.

2014-11-28 21:20:09 -08:00

vent_scrubber.dm

Fix scrubbers turning off.

2014-11-30 15:12:27 -08:00

vent.dm

Pipe fixes, vent standardization, AI announce fixes.

2014-12-11 14:07:13 -08:00