Merge pull request #3178 from Aurorablade/insertlewdcommenthere

try to fix mindslave implant hud

code/datums/hud.dm

@@ -71,7 +71,13 @@ var/datum/atom_hud/huds = list( \
 	//	for(var/datum/gang/G in ticker.mode.gangs)
 	//		gang_huds += G.ganghud
 
-	for(var/datum/atom_hud/hud in huds)//|gang_huds))
+	var/serv_huds = list()//mindslaves and/or vampire thralls
+	if(ticker.mode)
+		for(var/datum/mindslaves/serv in (ticker.mode.vampires | ticker.mode.traitors))
+			serv_huds += serv.thrallhud
+
+
+	for(var/datum/atom_hud/hud in (huds|serv_huds))//|gang_huds))
 		if(src in hud.hudusers)
 			hud.add_hud_to(src)
 

code/datums/mind.dm

@@ -60,6 +60,7 @@
 
 	var/antag_hud_icon_state = null //this mind's ANTAG_HUD should have this icon_state
 	var/datum/atom_hud/antag/antag_hud = null //this mind's antag HUD
+	var/datum/mindslaves/som //stands for slave or master...hush..
 
 	var/rev_cooldown = 0
 
@@ -903,6 +904,9 @@
 					ticker.mode.vampires += src
 					ticker.mode.grant_vampire_powers(current)
 					ticker.mode.update_vampire_icons_added(src)
+					var/datum/mindslaves/slaved = new()
+					slaved.masters += src
+					src.som = slaved //we MIGT want to mindslave someone
 					special_role = "Vampire"
 					current << "<B><font color='red'>Your powers are awoken. Your lust for blood grows... You are a Vampire!</font></B>"
 					log_admin("[key_name(usr)] has vampired [key_name(current)]")
@@ -999,6 +1003,9 @@
 			if("traitor")
 				if(!(src in ticker.mode.traitors))
 					ticker.mode.traitors += src
+					var/datum/mindslaves/slaved = new()
+					slaved.masters += src
+					src.som = slaved //we MIGT want to mindslave someone
 					special_role = "traitor"
 					current << "<B>\red You are a traitor!</B>"
 					log_admin("[key_name(usr)] has traitored [key_name(current)]")