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

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

conflicts resolution

2014-12-16 02:52:08 +03:00

..

Chemistry-Reagents

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

2014-12-16 02:52:08 +03:00

reagent_containers

Merge pull request #6199 from Ergovisavi/less_terrible_human_plants

2014-12-07 17:34:54 +01:00

Chemistry-Colours.dm

…

Chemistry-Holder.dm

Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research

2014-08-23 02:02:46 +02:00

Chemistry-Machinery.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

Chemistry-Readme.dm

…

Chemistry-Recipes.dm

Fixes chem reactions

2014-12-07 16:42:37 -05:00

grenade_launcher.dm

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

2014-08-29 04:21:15 -07:00

reagent_containers.dm

Add's banned_reagents list to reagent_containers,

2014-11-16 10:28:43 +00:00

reagent_dispenser.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

syringe_gun.dm

Change examine() from an atom verb to a mob verb

2014-05-01 09:56:39 -07:00