bgobandit eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb ...

Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2016-05-15 17:19:14 -04:00

..

effects

Adds healy glows to cult pylons and the medbeam gun

2016-05-09 19:37:15 -04:00

items

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

2016-05-15 17:19:14 -04:00

structures

Merge pull request #17613 from coiax/morphling-holodeck

2016-05-13 23:35:00 -05:00

buckling.dm

…

empulse.dm

t&a

2016-04-20 16:38:55 -04:00

explosion.dm

…

items.dm

Makes dismemberment more adjustable (#17587)

2016-05-13 20:27:06 +02:00

objs.dm

…

radiation.dm

…

structures.dm

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

weapons.dm

…