PsiOmega 9d90691605 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/gamemodes/wizard/spellbook.dm

2015-06-14 10:35:29 +02:00

..

_docs.dm

…

_gas_mixture_xgm.dm

Fixes #8450

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

_xgm_gas_data.dm

Adds entropy, thermal energy procs to new gas mix

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

Airflow.dm

That should be it for procs there.

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

Atom.dm

Minor ZAS-related cleanup

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

Connection.dm

fix an issue with ZAS geometry not re-forming

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

ConnectionGroup.dm

add sleeping for ZAS connection edges

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

ConnectionManager.dm

…

Controller.dm

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

2015-06-14 10:35:29 +02:00

Debug.dm

…

Diagnostic.dm

…

Fire.dm

Cleans up debug prints

2015-05-19 17:47:51 -04:00

Gas.dm

Adds entropy, thermal energy procs to new gas mix

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

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 pull request #9691 from Baystation12/master

2015-06-05 21:41:58 +09:30

Variable Settings.dm

…

Zone.dm

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

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