mwerezak 5ca36fcadb Merge branch 'dev' into power-net ...

Conflicts:
	code/game/machinery/Freezer.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/modules/organs/organ_external.dm

Also updated:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	nano/templates/gas_pump.tmpl

2014-07-16 16:14:52 -04:00

..

cold_sink.dm

-Multiple fixes for machinery not correctly updating their icons when depowered.

2012-12-30 02:20:03 +00:00

generator_input.dm

…

heat_exchanger.dm

…

heat_source.dm

Merge branch 'dev' into power-net

2014-07-16 16:14:52 -04:00

outlet_injector.dm

Pipe rendering rewrite

2014-07-14 19:12:22 +12:00

oxygen_generator.dm

…

thermal_plate.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

unary_base.dm

Pipe rendering rewrite

2014-07-14 19:12:22 +12:00

vent_pump.dm

Vent pumps now draw power

2014-07-16 00:47:38 -04:00

vent_scrubber.dm

Pipe rendering rewrite

2014-07-14 19:12:22 +12:00