PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

2015-10-11 17:17:41 +02:00

..

_docs.dm

Allows indirectly connected turfs to merge zones if either zone is small enough.

2015-08-26 14:25:43 -04:00

Airflow.dm

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

2015-08-18 18:05:16 +02: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

Added documentation, split ConnectionManager.dm, removed some unused procs.

2014-02-21 08:39:04 -07:00

Controller.dm

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

2015-08-27 08:53:22 +02:00

Debug.dm

Fixed nuke shuttle being a swirly vortex of death.

2014-02-26 08:16:52 -07:00

Diagnostic.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

Fire.dm

Fixes calculate_firelevel() not counting oxidizer

2015-10-08 23:40:08 -04:00

Phoron.dm

Minor folders. code/defines, code/FEA, code/__HELPERS, code/_onclick, code/TriDimension, code/ZAS

2015-05-29 20:36:48 +01:00

Turf.dm

Merge pull request #9691 from Baystation12/master

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

Variable Settings.dm

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

2015-10-11 17:17:41 +02:00

Zone.dm

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

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