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

Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2014-10-20 21:38:39 -07:00

..

biogenerator.dm

adds bomber and leather jackets

2014-10-20 21:36:40 -07:00

grown.dm

Returns the missing grassclump icon

2014-10-18 20:58:07 -04:00

growninedible.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

hydroitemdefines.dm

fixing conflict

2014-05-14 10:01:29 -05:00

hydroponics.dm

Resolved conflicts and added my yml changelog file

2014-09-19 09:30:59 -06:00

seed_extractor.dm

Added a check for "_nodrop_" items for several machines/structures (fix #3407).

2014-04-20 20:49:32 +02:00

seeds.dm

Carpet is now growable, whoa!

2014-10-03 19:53:44 -04:00