phil235 74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation ...

Conflicts:
	code/modules/mob/living/living.dm

2014-11-04 18:55:07 +01:00

..

components

Fixes typos and show messages. Fixes attack animation code.

2014-11-03 01:06:02 +01:00

pipes

Fixes #5374

2014-10-20 13:40:25 +02:00

atmospherics.dm

fixes atmospherics not working

2014-11-04 01:10:18 -08:00

datum_pipe_network.dm

added a new proc for atmos machinery, nullifyPipenetwork(). As their name says, it will nullify the references of a pipenet network datum.

2014-09-02 19:22:27 -03:00

datum_pipeline.dm

Fixes the multiplication of air contents inside of the pipes when disconnecting and reconnecting sections.

2014-09-16 09:32:37 -03:00

he_pipes.dm

Updated heat pipes, red pipes, manifolds and normal pipes icons to show completely disconnected pipes.

2014-09-02 20:13:01 -03:00

pipes.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00