phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

chemistry

Merge pull request #17337 from ChangelingRain/innatecomms

2016-05-03 20:23:52 -05:00

reagent_containers

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

2016-05-05 21:57:10 +02:00

chem_splash.dm

Adds Chemical Explosives

2016-04-13 13:09:41 -07:00

reagent_containers.dm

Plant Refactor 4

2016-03-07 12:46:12 +03:00

reagent_dispenser.dm

Blobs can no longer eat the supermatter (#17205)

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