Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

food

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

glass

Added lids for bottles and beakers.

2013-05-26 06:38:38 +04:00

blood_pack.dm

Replaced codersprite for bloodpack with new ones.

2013-01-03 03:40:36 +04:00

borghydro.dm

Fixes #3993

2014-05-10 10:26:05 +09:30

dropper.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

food.dm

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00

glass.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

hypospray.dm

Fixes reagent and throw logging.

2013-08-30 00:38:10 +01:00

pill.dm

Lousy goddamn indentation.

2014-05-03 21:09:55 +09:30

robodropper.dm

Fixes reagent and throw logging.

2013-08-30 00:38:10 +01:00

spray.dm

Added smaller spraybottle for drones.

2014-05-31 22:15:28 +09:30

syringes.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00