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

..

collectable.dm

Makes burn_state use defines

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

hardhat.dm

Makes burn_state use defines

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

helmet.dm

Makes burn_state use defines

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

jobs.dm

BeretChange

2015-10-22 15:08:40 +08:00

misc_special.dm

Makes burn_state use defines

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

misc.dm

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

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

soft_caps.dm

- fixes handcuff overlay on monkey not showing.

2015-07-17 01:15:21 +02:00