PsiOmegaDelta 27feb09a31 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml

2015-10-11 17:37:01 +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 pull request #10420 from Kearel/sbike

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

Atom.dm

Multi-Z.

2015-08-30 14:15:20 -07:00

Connection.dm

…

ConnectionGroup.dm

…

ConnectionManager.dm

…

Controller.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-29 10:06:18 +02: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

Adjusts phoron exposure to use body_parts_covered

2015-08-18 17:18:25 -04: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