Chinsky e74cd95fec Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/game/turfs/turf.dm
	code/modules/clothing/spacesuits/rig.dm

2013-02-02 23:10:12 +04:00

..

Airflow.dm

Fixed runtimes in airflow.

2013-01-16 22:05:31 +04:00

Connection.dm

…

Debug.dm

…

FEA_gas_mixture.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

FEA_system.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2012-11-17 00:20:23 +04:00

Fire.dm

tweaked fire to lower fuel/oxy requirements, increase temperature rise, made it a bit easier to get fires working

2013-02-01 23:06:40 +10:00

Functions.dm

…

Plasma.dm

…

Variable Settings.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

ZAS_Turfs.dm

…

ZAS_Zones.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12

2013-02-02 23:10:12 +04:00