Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 ...

# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#

2018-01-09 14:40:09 -05:00

..

cold_sink.dm

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

generator_input.dm

…

heat_exchanger.dm

Prepare Atmospherics Machinery for SSatoms (#4501)

2018-01-06 10:52:56 -06:00

heat_source.dm

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -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

unary_base.dm

Prepare Atmospherics Machinery for SSatoms (#4501)

2018-01-06 10:52:56 -06:00

vent_pump.dm

Prepare Atmospherics Machinery for SSatoms (#4501)

2018-01-06 10:52:56 -06:00

vent_scrubber.dm

Prepare Atmospherics Machinery for SSatoms (#4501)

2018-01-06 10:52:56 -06:00