Merge pull request #956 from TheDZD/shadowling

Shadowling Fixes

code/modules/admin/player_panel.dm

@@ -504,12 +504,15 @@
 		if(ticker.mode.shadows.len)
 			dat += check_role_table("Shadowlings", ticker.mode.shadows, src)
 
-		if(ticker.mode.thralls.len)
-			dat += check_role_table("Shadowling Thralls", ticker.mode.thralls, src)
+		if(ticker.mode.shadowling_thralls.len)
+			dat += check_role_table("Shadowling Thralls", ticker.mode.shadowling_thralls, src)
 
 		if(ticker.mode.vampires.len)
 			dat += check_role_table("Vampires", ticker.mode.vampires, src)
 
+		if(ticker.mode.enthralled.len)
+			dat += check_role_table("Vampire Thralls", ticker.mode.enthralled, src)
+
 		if(ticker.mode.xenos.len)
 			dat += check_role_table("Xenos", ticker.mode.xenos, src)
 

code/modules/mob/language.dm

@@ -364,6 +364,12 @@
 	key = "8"
 	flags = RESTRICTED | HIVEMIND
 
+/datum/language/shadowling/broadcast(var/mob/living/speaker, var/message, var/speaker_mask)
+	if(speaker.mind && speaker.mind.special_role)
+		..(speaker, message, "([speaker.mind.special_role]) [speaker]")
+	else
+		..(speaker, message)
+
 /datum/language/ling/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
 
 	if(speaker.mind && speaker.mind.changeling)

code/modules/mob/living/carbon/human/life.dm

@@ -1762,6 +1762,10 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					holder.icon_state = "mutineer"
 				if("mutineer")
 					holder.icon_state = "mutineer"
+				if("Shadowling")
+					holder.icon_state = "hudshadowling"
+				if("Shadowling Thrall")
+					holder.icon_state = "hudshadowlingthrall"
 
 			hud_list[SPECIALROLE_HUD] = holder