Ccomp5950 63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06: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

Added no-network check to heat_source to fix a runtime if not connected to a network.

2014-01-24 09:56:02 +00:00

outlet_injector.dm

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

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

oxygen_generator.dm

…

thermal_plate.dm

Expansion of every "icon = ''" path.

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

unary_base.dm

…

vent_pump.dm

Vent pump efficiency

2014-02-18 16:16:10 +13:00

vent_scrubber.dm

Finishing touches on Air Alarms, Firedoors, and Central Atmos Control

2013-01-04 22:00:56 -07:00