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

..

binary_devices

Minor tweaks and fixes for airlock equipment

2014-02-13 14:21:18 +13:00

trinary_devices

Removed ID requirement for gas filters

2014-02-08 18:35:01 +13:00

unary

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

2014-02-20 19:16:23 -06:00

portables_connector.dm

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

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

tvalve.dm

Expansion of every "icon = ''" path.

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

valve.dm

Fixes issue 1001.

2012-10-17 14:27:23 +00:00