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

..

sheets

Resolved more conflicts with drying rack before being pulled

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

tiles

Removed copypaste for cyborg metal sheets

2014-01-17 15:45:09 -08:00

medical.dm

Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs.

2014-01-06 06:34:17 -03:00

rods.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

stack.dm

FIXED: inconsistencies with stack item names.

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