Mloc-Argent 4871a3a850 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi

2014-10-15 22:13:44 +01:00

..

_docs.dm

…

_gas_mixture_xgm.dm

updating turf gas overlays is now delta-based

2014-09-11 20:13:10 +01:00

_gas_mixture.dm

Cleanup, adds setup parameters for atmos machinery

2014-07-26 13:50:25 -04:00

_xgm_gas_data.dm

Adds entropy, thermal energy procs to new gas mix

2014-07-24 17:36:57 -04:00

Airflow.dm

fixes #6090

2014-10-01 10:17:55 +01:00

Atom.dm

fix an issue with ZAS geometry not re-forming

2014-10-14 11:57:31 +01:00

Connection.dm

fix an issue with ZAS geometry not re-forming

2014-10-14 11:57:31 +01:00

ConnectionGroup.dm

fix an issue with ZAS geometry not re-forming

2014-10-14 11:57:31 +01:00

ConnectionManager.dm

…

Controller.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

Debug.dm

…

Diagnostic.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

Fire.dm

Fixes phoron reactions with oxygen not following a consistent reaction equation

2014-08-13 19:56:02 +02:00

Gas.dm

Adds entropy, thermal energy procs to new gas mix

2014-07-24 17:36:57 -04:00

Phoron.dm

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

Turf.dm

fix gas overlays persisting after rebuilds

2014-09-30 20:51:59 +01:00

Variable Settings.dm

…

Zone.dm

fix gas overlays persisting after rebuilds

2014-09-30 20:51:59 +01:00