mwerezak 79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net ...

Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm

2014-07-24 16:04:41 -04:00

..

binary_atmos_base.dm

Pipe rendering rewrite

2014-07-18 13:39:39 +00: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-18 13:39:39 +00:00

passive_gate.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

pipeturbine.dm

Forgot code file

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

pump.dm

Merge remote-tracking branch 'upstream/dev' into power-net

2014-07-24 16:04:41 -04:00

volume_pump.dm

Merge remote-tracking branch 'upstream/dev' into power-net

2014-07-18 15:02:07 -04:00