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

..

asset_cache.dm

Reduce NanoUI size by hosting fonts externally

2015-12-17 10:15:13 -06:00

client defines.dm

Jobban cleanup & performance improvements

2015-11-28 12:35:54 -03:00

client procs.dm

Line ending apocalypse

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

message.dm

Cleans up isbanned() and stickyban handling

2015-09-26 23:30:26 -07:00

preferences_savefile.dm

Line ending apocalypse

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

preferences_toggles.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00

preferences.dm

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

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