skull132 87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03: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 pull request #10420 from Kearel/sbike

2015-09-07 13:58:25 +09:30

Atom.dm

Removes unused pressure_resistance variable.

2016-02-03 18:17:52 -05:00

Connection.dm

…

ConnectionGroup.dm

add sleeping for ZAS connection edges

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

ConnectionManager.dm

…

Controller.dm

Merge pull request #11696 from Baystation12/dev-freeze

2015-12-16 11:01:41 +01:00

Debug.dm

…

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

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03: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

Fixes duplicate gas layers

2015-12-15 13:42:31 +01:00