Merge branch 'font'

Conflicts:
	code/modules/client/client procs.dm
	code/stylesheet.dm
	fonts/skrell.ttf
	fonts/slime.ttf
This commit is contained in:
ZomgPonies
2014-02-28 15:26:59 -05:00
5 changed files with 13 additions and 2 deletions
+6 -1
View File
@@ -347,5 +347,10 @@
'icons/stamp_icons/large_stamp-cap.png',
'icons/stamp_icons/large_stamp-qm.png',
'icons/stamp_icons/large_stamp-law.png'
)
var/list/extra_resources = list(\
'fonts/slime.ttf',
'fonts/skrell.ttf',
'fonts/binary.ttf'
)