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

..

glass.dm

Updated all suicide_act()s to use a new span class, 'suicide'.

2014-01-19 16:46:37 +00:00

leather.dm

Committed Cael Aislinn's proposed commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11641

2013-01-08 16:30:45 +00:00

light.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

mineral.dm

FIXED: inconsistencies with stack item names.

2013-11-24 00:14:46 +01:00

sheet_types.dm

Resolved more conflicts with drying rack before being pulled

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

sheets.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00