D3athrow 57c8aa2d22 Merge branch Bleeding-Edge into snowflake_the_world ...

Conflicts:
	code/game/objects/effects/overlays.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm

2015-08-25 04:18:02 -05:00

..

_docs.dm

ZAS updates from Bay in a shitty attempt to fix our lagspikes.

2014-04-10 22:29:26 -07:00

_gas_mixture.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Airflow.dm

Atom locking

2015-08-15 15:06:04 +02:00

Atom.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Connection.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

ConnectionGroup.dm

watafak

2015-08-16 16:21:41 -05:00

ConnectionManager.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Controller.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Debug.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Diagnostic.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

FEA_gas_mixture.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

FEA_system.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Fire.dm

Merge branch Bleeding-Edge into snowflake_the_world

2015-08-25 04:18:02 -05:00

Functions.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

NewSettings.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Plasma.dm

not necessarily needed and poses a performance issue.

2015-08-14 21:32:05 -05:00

Turf.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Variable Settings.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

ZAS_Turfs.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

ZAS_Zones.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00

Zone.dm

comment out panicwriter and saytesting

2015-07-20 16:04:48 -05:00