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

..

_omni_extras.dm

Pipe rendering rewrite

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

filter.dm

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

mixer.dm

Continued work in progress on a major revision of the NanoUI templating system.

2014-07-11 10:48:42 +01:00

omni_base.dm

Pipe rendering rewrite

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