From 0e858e3be5beff4503f99714d4ec85149f124d72 Mon Sep 17 00:00:00 2001
From: Aurorablade <lemastera@gmail.com>
Date: Thu, 28 Jul 2016 00:20:04 -0400
Subject: [PATCH] i suck yous blood yaya?

---
 code/game/gamemodes/vampire/vampire.dm               |  7 +++++--
 .../mob/living/carbon/human/human_attackhand.dm      | 12 ++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index 2d8018a3f8e..a3be8b23c64 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -10,7 +10,7 @@
 	config_tag = "vampire"
 	restricted_jobs = list("AI", "Cyborg")
 	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer")
-	protected_species = list("Machine")
+	protected_species = list("Machine", "Plasmaman")
 	required_players = 15
 	required_enemies = 1
 	recommended_enemies = 4
@@ -273,7 +273,10 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
 	owner.attack_log += text("\[[time_stamp()]\] <font color='red'>Bit [H] ([H.ckey]) in the neck and draining their blood</font>")
 	H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been bit in the neck by [owner] ([owner.ckey])</font>")
 	log_attack("[owner] ([owner.ckey]) bit [H] ([H.ckey]) in the neck")
-	owner.visible_message("<span class='danger'>[owner] bites [H]'s neck!</span>", "<span class='danger'>You bite [H]'s neck and begin to drain their blood.</span>", "<span class='notice'>You hear a soft puncture and a wet sucking noise.</span>")
+	if(owner.get_species() == "Vox")
+		owner.visible_message("<span class='danger'>[owner] stabs a needled internals tube into [H]'s neck!</span>", "<span class='danger'>You stab a needled internals tube into [H]'s neck and begin to drain their blood.</span>", "<span class='notice'>You hear a soft puncture and a wet sucking noise.</span>")
+	else
+		owner.visible_message("<span class='danger'>[owner] bites [H]'s neck!</span>", "<span class='danger'>You bite [H]'s neck and begin to drain their blood.</span>", "<span class='notice'>You hear a soft puncture and a wet sucking noise.</span>")
 	if(!iscarbon(owner))
 		H.LAssailant = null
 	else
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index d39aa319e51..08544b1aca4 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -110,12 +110,20 @@
 		if(I_HARM)
 			//Vampire code
 			if(M.mind && M.mind.vampire && (M.mind in ticker.mode.vampires) && !M.mind.vampire.draining && M.zone_sel && M.zone_sel.selecting == "head" && src != M)
+				if(species && species.flags & NO_BLOOD)//why this hell were we never checkinf for this?
+					to_chat(M, "<span class='warning'>They have no blood!</span>")
 				if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH)))
 					to_chat(M, "<span class='warning'>Remove their mask!</span>")
 					return
 				if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
-					to_chat(M, "<span class='warning'>Remove your mask!</span>")
-					return
+					if(M.get_species() == "Vox")
+						M.mind.vampire.handle_bloodsucking(src)
+						add_logs(src, M, "vampirebit")
+						msg_admin_attack("[key_name_admin(M)] vampirebit [key_name_admin(src)]")
+						return
+					else
+						to_chat(M, "<span class='warning'>Remove your mask!</span>")
+						return
 				if(mind && mind.vampire && (mind in ticker.mode.vampires))
 					to_chat(M, "<span class='warning'>Your fangs fail to pierce [src.name]'s cold flesh</span>")
 					return