Merge pull request #3824 from Tastyfish/vamppow

Refactors vampire abilities, also some vamp fixes

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

@@ -135,7 +135,7 @@
 							M << "<span class='warning'>Blood from a monkey is useless!</span>"
 							return 0
 						//we're good to suck the blood, blaah
-						M.handle_bloodsucking(src)
+						M.mind.vampire.handle_bloodsucking(src)
 						add_logs(src, M, "vampirebit")
 						msg_admin_attack("[key_name_admin(M)] vampirebit [key_name_admin(src)]")
 						return

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

@@ -88,7 +88,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 	pulse = handle_pulse()
 
 	if(mind && mind.vampire)
-		handle_vampire()
+		mind.vampire.handle_vampire()
 		if(life_tick == 1)
 			regenerate_icons() // Make sure the inventory updates
 

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

@@ -423,14 +423,12 @@
 		H.see_invisible = SEE_INVISIBLE_LIVING
 
 		if(H.mind && H.mind.vampire)
-			if((VAMP_VISION in H.mind.vampire.powers) && (!(VAMP_FULL in H.mind.vampire.powers)))
-				H.sight |= SEE_MOBS
-
-			else if(VAMP_FULL in H.mind.vampire.powers)
+			if(H.mind.vampire.get_ability(/datum/vampire_passive/full))
 				H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 				H.see_in_dark = 8
 				H.see_invisible = SEE_INVISIBLE_MINIMUM
-
+			else if(H.mind.vampire.get_ability(/datum/vampire_passive/vision))
+				H.sight |= SEE_MOBS
 
 		if(XRAY in H.mutations)
 			H.sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS