Vampire commit 2

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

@@ -1,3 +1,9 @@
+/mob/living/carbon/Login()
+	..()
+	update_hud()
+	return
+
+
 /mob/living/carbon/Move(NewLoc, direct)
 	. = ..()
 	if(.)

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

@@ -126,6 +126,13 @@
 		G.process()
 
 	if(mind && mind.vampire)
+		if(hud_used)
+			if(!hud_used.vampire_blood_display)
+				hud_used.vampire_hud()
+				//hud_used.human_hud(hud_used.ui_style)
+			hud_used.vampire_blood_display.maptext_width = 64
+			hud_used.vampire_blood_display.maptext_height = 26
+			hud_used.vampire_blood_display.maptext = "<div align='left' valign='top' style='position:relative; top:0px; left:6px'> U:<font color='#33FF33' size='1'>[mind.vampire.bloodusable]</font><br> T:<font color='#FFFF00' size='1'>[mind.vampire.bloodtotal]</font></div>"
 		handle_vampire_cloak()
 
 

code/modules/mob/living/login.dm

@@ -6,21 +6,20 @@
 
 	//Round specific stuff like hud updates
 	if(ticker && ticker.mode)
-		switch(ticker.mode.name)
-			if("revolution")
-				if((mind in ticker.mode.revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
-					ticker.mode.update_rev_icons_added(src.mind)
-			if("cult")
-				if(mind in ticker.mode:cult)
-					ticker.mode.update_cult_icons_added(src.mind)
-			if("nuclear emergency")
-				if(mind in ticker.mode:syndicates)
-					ticker.mode.update_all_synd_icons()
+		if((mind in ticker.mode.revolutionaries) || (src.mind in ticker.mode:head_revolutionaries))
+			ticker.mode.update_rev_icons_added(src.mind)
+		if(mind in ticker.mode:cult)
+			ticker.mode.update_cult_icons_added(src.mind)
+		if(mind in ticker.mode:syndicates)
+			ticker.mode.update_all_synd_icons()
 		var/ref = "\ref[mind]"
 		if(ref in ticker.mode.implanter)
 			ticker.mode.update_traitor_icons_added(mind)
 		if(mind in ticker.mode.implanted)
 			ticker.mode.update_traitor_icons_added(mind)
+		if((ref in ticker.mode.thralls) || (mind in ticker.mode.enthralled))
+			ticker.mode.update_vampire_icons_added(mind)
+		return
 	return .
 
 

code/modules/virus2/disease2.dm

@@ -102,6 +102,7 @@
 	disease.uniqueID = uniqueID
 	disease.speed = speed
 	disease.stage = stage
+	disease.clicks = clicks
 	for(var/datum/disease2/effectholder/holder in effects)
 		var/datum/disease2/effectholder/newholder = new /datum/disease2/effectholder
 		newholder.effect = new holder.effect.type