Cael_Aislinn 283ae84dad various mergefixes ...

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-09-22 21:37:42 +10:00

..

Airflow.dm

moved some re-used ul procs to another file

2012-08-25 01:59:05 +10:00

Connection.dm

…

Debug.dm

various mergefixes

2012-09-22 21:37:42 +10:00

FEA_gas_mixture.dm

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

FEA_system.dm

Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns. In addition, improved supermatter, and humans now absorb all the oxygen they inhale, due to the ludicrous volumes of air normally encountered (Does not reduce effectiveness of air tanks)

2012-08-21 01:18:01 -07:00

Fire.dm

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

Functions.dm

…

Plasma.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

Variable Settings.dm

…

ZAS_Turfs.dm

Fixes for ZAS, including fire, geometry, rebuilding consideration, and atmospheric lockdowns. In addition, improved supermatter, and humans now absorb all the oxygen they inhale, due to the ludicrous volumes of air normally encountered (Does not reduce effectiveness of air tanks)

2012-08-21 01:18:01 -07:00

ZAS_Zones.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport. May have overwritten some tweaks from Sky here.

2012-08-22 04:19:23 +10:00