Ccomp5950 c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm

2014-01-23 00:05:53 -06:00

..

Airflow.dm

Magboots fix.

2013-07-28 14:31:23 +03:00

Connection.dm

Updates the zone-sleeping code to account for turf changes.

2013-10-05 12:38:33 -07:00

Debug.dm

Adds developer-level access to ZAS settings.

2014-01-10 16:48:16 -07:00

FEA_gas_mixture.dm

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

FEA_system.dm

Updates the zone-sleeping code to account for turf changes.

2013-10-05 12:38:33 -07:00

Fire.dm

Update Fire.dm

2014-01-01 23:19:27 +01:00

Functions.dm

First pass on experimental change that allows zones to "Sleep"

2013-09-11 11:43:42 -07:00

Plasma.dm

Medical Hoopery

2013-11-14 12:40:30 -05:00

Variable Settings.dm

Adds developer-level access to ZAS settings.

2014-01-10 16:48:16 -07:00

ZAS_Turfs.dm

Reverts some geometry code to a functional state.

2014-01-08 23:00:11 -07:00

ZAS_Zones.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

2014-01-23 00:05:53 -06:00