GinjaNinja32 c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro ...

Conflicts:
	code/modules/virus2/disease2.dm

2015-02-03 15:33:37 +00:00

..

reagent_containers

Merge pull request #7719 from Zuhayr/species_tweaks

2015-02-03 18:11:18 +03:00

Chemistry-Colours.dm

Mixing of paint

2015-02-01 22:54:18 +01:00

Chemistry-Holder.dm

Mixing of paint

2015-02-01 22:54:18 +01:00

Chemistry-Machinery.dm

Merge pull request #7930 from RKF45/newpaint

2015-02-03 18:15:42 +03:00

Chemistry-Readme.dm

Paint mixing

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

Chemistry-Reagents-Antidepressants.dm

Replaces dummy reagent colours

2014-12-12 16:06:16 -05:00

Chemistry-Reagents.dm

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

2015-02-03 15:33:37 +00:00

Chemistry-Recipes.dm

Reviewing paint recipes

2015-02-01 01:34:39 +01:00

dartgun.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

grenade_launcher.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

reagent_containers.dm

Fixes reagent_containers not being usable for surgery

2014-07-06 15:37:05 -04:00

reagent_dispenser.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

syringe_gun.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00