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

..

glasses

Adds mats/origintech/burn_state to more items.

2015-12-10 15:32:28 -05:00

gloves

Makes burn_state use defines

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

head

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

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

masks

Makes burn_state use defines

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

outfits

Fixes beam crossing

2015-12-12 12:26:37 +01:00

shoes

Makes burn_state use defines

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

spacesuits

Recharge fix

2015-12-16 20:02:04 -06:00

suits

Line ending apocalypse

2015-12-17 14:12:37 +13:00

under

necklaces again

2015-12-16 20:47:00 -08:00

clothing.dm

Makes burn_state use defines

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