Mloc-Argent e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm

2014-05-14 22:42:03 +01:00

..

reagent_containers

Merge remote-tracking branch 'upstream/master' into dev

2014-05-11 13:19:09 +00:00

Chemistry-Colours.dm

Rework of colour mixing

2014-01-19 21:47:42 +01:00

Chemistry-Holder.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

Chemistry-Machinery.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

Chemistry-Readme.dm

Paint mixing

2014-01-11 22:19:02 +01:00

Chemistry-Reagents-Antidepressants.dm

Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.

2014-01-08 21:33:17 -07:00

Chemistry-Reagents.dm

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

Chemistry-Recipes.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-05-14 22:42:03 +01:00

dartgun.dm

…

grenade_launcher.dm

…

reagent_containers.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

reagent_dispenser.dm

Adjusted fuel spread

2014-04-17 21:19:05 -04:00

syringe_gun.dm

Fixes #3993

2014-05-10 10:26:05 +09:30