JJRcop 0e45022798 Resolved more conflicts with drying rack before being pulled ...

Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi

2014-01-21 13:01:53 -05:00

..

reagent_containers

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05:00

Chemistry-Colours.dm

Returned /proc/mix_color_from_reagents(var/list/reagent_list) to normal, so crayons mix like normal reagents.

2013-10-09 05:45:00 +11:00

Chemistry-Holder.dm

Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950.

2013-12-13 21:14:23 +00:00

Chemistry-Machinery.dm

Fixing conflicts

2014-01-15 09:37:17 -05:00

Chemistry-Readme.dm

…

Chemistry-Reagents.dm

dds Drying Rack, Various Plants, Rollies, Pipes, and Torches

2014-01-07 15:40:49 -05:00

Chemistry-Recipes.dm

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05: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