mwerezak 79d4c444c2 Merge remote-tracking branch 'upstream/dev' into power-net ...

Conflicts:
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/game/machinery/alarm.dm
	code/game/machinery/spaceheater.dm

2014-07-24 16:04:41 -04:00

..

_docs.dm

Added Reboot ZAS as a debug verb.

2014-02-22 09:09:48 -07:00

_gas_mixture_xgm.dm

new XGM gas mixture datum

2014-07-22 18:38:31 +01:00

_gas_mixture.dm

Updates gas heaters

2014-07-15 20:34:48 -04:00

_xgm_gas_data.dm

new XGM gas mixture datum

2014-07-22 18:38:31 +01:00

Airflow.dm

Probability to bleed by airflow_hit lowered from 100% to 33%

2014-06-07 04:52:19 +02:00

Atom.dm

Added Z-level support.

2014-02-21 08:38:44 -07:00

Connection.dm

Added documentation, split ConnectionManager.dm, removed some unused procs.

2014-02-21 08:39:04 -07:00

ConnectionGroup.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

ConnectionManager.dm

Added documentation, split ConnectionManager.dm, removed some unused procs.

2014-02-21 08:39:04 -07:00

Controller.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

Debug.dm

Fixed nuke shuttle being a swirly vortex of death.

2014-02-26 08:16:52 -07:00

Diagnostic.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

Fire.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

Gas.dm

new XGM gas mixture datum

2014-07-22 18:38:31 +01:00

Phoron.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

Turf.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

Variable Settings.dm

Now variables renamed too.

2014-05-14 16:25:37 +04:00

Zone.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00