PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm

2015-04-08 10:55:26 +02:00

..

cold_sink.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

generator_input.dm

…

heat_exchanger.dm

Committing for Numbers.

2012-09-30 19:31:35 +00:00

heat_source.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

outlet_injector.dm

Atmos machine update

2015-01-02 01:46:18 -05:00

oxygen_generator.dm

fix some misplaced set_dir()s

2014-12-08 10:09:09 +00:00

thermal_plate.dm

Expansion of every "icon = ''" path.

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

unary_base.dm

Replaces awful connect type system with bitflags

2014-12-23 18:59:54 -05:00

vent_pump.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-04-08 10:55:26 +02:00

vent_scrubber.dm

Examination fixes.

2015-04-06 10:46:19 +02:00