phil235 a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm

2015-06-24 21:15:09 +02:00

..

beams.dm

Xray gun nerf is just the 15 tiles range.

2015-06-16 19:49:25 +02:00

bullets.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

energy.dm

DRAGnet lives!

2015-06-15 23:55:28 -05:00

magic.dm

Lots of work on acids, smoke, foam, reagents reaction() proc.

2015-06-22 00:35:24 +02:00

reusable.dm

Some adjustments:

2015-04-02 17:39:02 +02:00

special.dm

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00