Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00
parent d85fd94570 02887eb721
commit e57cf81636
413 changed files with 10010 additions and 7528 deletions
@@ -35,7 +35,8 @@
 	return TRUE

 /datum/language/proc/get_icon()
-	return "[icon2html(icon, world, icon_state)]"
+	var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/goonchat)
+	return sheet.icon_tag("language-[icon_state]")

 /datum/language/proc/get_random_name(gender, name_count=2, syllable_count=4, syllable_divisor=2)
 	if(!syllables || !syllables.len)