Razharas a589387ccf Fixing merge conflicts ...

THis is getting harder and harder

2014-02-06 22:26:16 +04:00

..

reagent_containers

Adds crlf default to .gitattributes for most text file types we use.

2014-02-04 15:14:39 +00:00

Chemistry-Colours.dm

Reagents can now mix their alpha color.

2014-01-21 16:06:28 +00:00

Chemistry-Holder.dm

Added add_reagent_list, a useful proc if you want to add a lot of reagents from a list.

2014-01-20 15:05:47 +00:00

Chemistry-Machinery.dm

Fixing merge conflicts

2014-02-06 22:26:16 +04:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

Merge pull request #2473 from Giacom/reagent_mix_alpha

2014-01-24 11:53:42 -08:00

Chemistry-Recipes.dm

Fixes issue 555 by making hostile mobs run CanAttack() on the occupant of mechs

2014-02-02 18:52:36 -08:00

grenade_launcher.dm

Update grenade_launcher.dm

2013-12-03 09:35:32 +01:00

reagent_containers.dm

…

reagent_dispenser.dm

Fixes an accidental oversight in replenishing cups. It now turns paper into cups using magic.

2014-01-17 17:37:57 -07:00

syringe_gun.dm

Syringe guns can suck it.

2014-01-02 16:18:48 -08:00