PsiOmega 3866fda394 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/ZAS/Turf.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living.dm
	code/modules/recycling/sortingmachinery.dm

2015-05-02 21:50:11 +02:00

..

_docs.dm

…

_gas_mixture_xgm.dm

Fixes #8450

2015-03-25 02:17:02 +00:00

_xgm_gas_data.dm

…

Airflow.dm

…

Atom.dm

Minor ZAS-related cleanup

2015-04-28 23:00:56 -04:00

Connection.dm

…

ConnectionGroup.dm

…

ConnectionManager.dm

…

Controller.dm

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

2015-05-02 21:50:11 +02:00

Debug.dm

…

Diagnostic.dm

…

Fire.dm

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

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

Gas.dm

…

Phoron.dm

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

Turf.dm

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

2015-05-02 21:50:11 +02:00

Variable Settings.dm

…

Zone.dm

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

2015-05-02 21:50:11 +02:00