bgobandit a2241e0f6f Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag ...

Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme

2015-12-17 20:12:32 -05:00

..

drinks

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

food

Adds the severing of lizard tails.

2015-12-10 18:58:37 -05:00

kitchen machinery

Makes everything that used spawn () throw_at use throw_at_fast

2015-12-05 16:40:52 -08:00

recipes

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

2015-12-17 20:12:32 -05:00

food.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00