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

..

binary_atmos_base.dm

Pipe rendering rewrite

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

circulator.dm

made TEG generate power from heat transferred again, restructed TEG and circulator code to be smaller and cleaner, added an "overload" to TEGs where they spark + power output drops if power output exceeds 250k

2013-05-19 18:50:15 +10:00

dp_vent_pump.dm

Pipe rendering rewrite

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

passive_gate.dm

Pipe rendering rewrite

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

pipeturbine.dm

Forgot code file

2014-05-26 12:48:06 +04:00

pump.dm

Merge branch 'dev' into power-net

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

volume_pump.dm

Replaces the volume gas pump

2014-07-15 19:31:02 -04:00