PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

_docs.dm

…

_gas_mixture_xgm.dm

Fixes #8450

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

_xgm_gas_data.dm

…

Airflow.dm

That should be it for procs there.

2015-02-27 13:09:40 +03:00

Atom.dm

…

Connection.dm

…

ConnectionGroup.dm

add sleeping for ZAS connection edges

2014-12-21 20:35:40 +00:00

ConnectionManager.dm

…

Controller.dm

Clean server start.

2015-04-18 15:32:25 +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

Switches around turf/datum garbage handling (my fault..). Adds null check for zone rebuilds.

2015-04-16 14:23:19 +02:00

Variable Settings.dm

…

Zone.dm

Implements phoron flashpoint

2015-03-09 01:00:26 -04:00