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

Conflicts:
	code/game/objects/items.dm

2015-07-06 18:33:09 +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

code/ATMOSPHERICS \red \blue etc to span classes

2015-05-29 19:36:15 +01: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

…

unary_base.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

vent_pump.dm

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

2015-07-06 18:33:09 +02:00

vent_scrubber.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00