PsiOmega 35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm

2015-08-29 10:06:18 +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 branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

Atom.dm

Minor ZAS-related cleanup

2015-04-28 23:00:56 -04: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

Fire now uses the full zone size when considering the minimum amount of phoron/oxygen required to sustain a fire

2015-07-26 22:47:18 -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

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

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

Zone.dm

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

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